Przeglądaj źródła

[security] Simplify bulk operation modals

Romain Rigaux 11 lat temu
rodzic
commit
2295e28c4d

+ 6 - 6
apps/security/src/security/templates/hdfs.mako

@@ -200,14 +200,14 @@ ${ layout.menubar(section='hdfs') }
 
     <div class="row-fluid">
       <div class="span6">
-        <h4>${ _('Checked paths') }</h4>
+        <h4>${ _('Path selection') }</h4>
         <ul class="unstyled modal-panel" data-bind="foreach: $root.assist.checkedItems">
           <li><a class="force-word-break" data-bind="attr: { href: '/filebrowser/view' + path }, text: path" target="_blank" title="${ _('Open in File Browser') }" rel="tooltip"></a></li>
         </ul>
       </div>
       <div class="span6">
 
-        <h4>${ _('Selected path for ACLs actions') }</h4>
+        <h4>${ _('ACLs to apply') }</h4>
 
         <span class="fake-pre modal-panel">
           # file: <a class="force-word-break" data-bind="attr: { href: '/filebrowser/view' + $root.assist.path() }, text: $root.assist.path()" target="_blank"></a><br/>
@@ -228,19 +228,19 @@ ${ layout.menubar(section='hdfs') }
       <div class="span4 center">
         <div class="big-btn" data-bind="css: {'selected': $root.assist.bulkAction() == 'add'}, click: function(){$root.assist.bulkAction('add')}">
           <i class="fa fa-plus"></i><br/><br/>
-          <span class="bulk-action-description">${ _('Add current ACLs to checkbox selection') }</span>
+          <span class="bulk-action-description">${ _('Add current ACLs to selection') }</span>
         </div>
       </div>
       <div class="span4 center">
         <div class="big-btn" data-bind="css: {'selected': $root.assist.bulkAction() == 'sync'}, click: function(){$root.assist.bulkAction('sync')}">
           <i class="fa fa-random"></i><br/><br/>
-          <span class="bulk-action-description">${ _('Replace checkbox selection with current ACLs') }</span>
+          <span class="bulk-action-description">${ _('Replace selection with current ACLs') }</span>
         </div>
       </div>
       <div class="span4 center">
         <div class="big-btn" data-bind="css: {'selected': $root.assist.bulkAction() == 'delete'}, click: function(){$root.assist.bulkAction('delete')}">
           <i class="fa fa-eraser"></i><br/><br/>
-          <span class="bulk-action-description">${ _('Remove all ACLs of checkbox selection') }</span>
+          <span class="bulk-action-description">${ _('Remove all ACLs of selection') }</span>
         </div>
       </div>
     </div>
@@ -249,7 +249,7 @@ ${ layout.menubar(section='hdfs') }
   <div class="modal-footer">
     <label class="checkbox pull-left"><input type="checkbox" data-bind="checked: $root.assist.recursive"> ${ _('Apply recursively to all subfolders and files') }</label>
     <button class="btn" data-dismiss="modal" aria-hidden="true">${ _('Cancel') }</button>
-    <button class="btn" data-bind="css: {'btn-primary': $root.assist.bulkAction() != 'delete', 'btn-danger': $root.assist.bulkAction() == 'delete'}, click: $root.assist.bulkPerfomAction">${ _('Confirm') }</button>
+    <button class="btn" data-bind="enable: $root.assist.bulkAction(), css: {'btn-primary': $root.assist.bulkAction() != 'delete', 'btn-danger': $root.assist.bulkAction() == 'delete'}, click: $root.assist.bulkPerfomAction">${ _('Confirm') }</button>
   </div>
 </div>
 

+ 6 - 6
apps/security/src/security/templates/hive.mako

@@ -352,14 +352,14 @@ ${ layout.menubar(section='hive') }
 
     <div class="row-fluid">
       <div class="span6">
-        <h4>${ _('Checked items') }</h4>
+        <h4>${ _('Selection') }</h4>
         <ul class="unstyled modal-panel" data-bind="foreach: $root.assist.checkedItems">
           <li><span class="force-word-break" data-bind="text: path"></span></li>
         </ul>
       </div>
       <div class="span6">
 
-        <h4>${ _('Selected item for privilege actions') }</h4>
+        <h4>${ _('Privileges to apply') }</h4>
 
         <div data-bind="visible: $root.assist.privileges().length == 0"><em class="muted">${ _('No privileges found for the selected item.')}</em></div>
         <div data-bind="template: { name: 'role', foreach: $root.assist.roles }" class="modal-panel"></div>
@@ -372,19 +372,19 @@ ${ layout.menubar(section='hive') }
       <div class="span4 center">
         <div class="big-btn" data-bind="css: {'selected': $root.bulkAction() == 'add'}, click: function(){$root.bulkAction('add')}">
           <i class="fa fa-plus"></i><br/><br/>
-          <span class="bulk-action-description">${ _('Add current privileges to checkbox selection') }</span>
+          <span class="bulk-action-description">${ _('Add current privileges to selection') }</span>
         </div>
       </div>
       <div class="span4 center">
         <div class="big-btn" data-bind="css: {'selected': $root.bulkAction() == 'sync'}, click: function(){$root.bulkAction('sync')}">
           <i class="fa fa-random"></i><br/><br/>
-          <span class="bulk-action-description">${ _('Replace checkbox selection with current privileges') }</span>
+          <span class="bulk-action-description">${ _('Replace selection with current privileges') }</span>
         </div>
       </div>
       <div class="span4 center">
         <div class="big-btn" data-bind="css: {'selected': $root.bulkAction() == 'delete'}, click: function(){$root.bulkAction('delete')}">
           <i class="fa fa-eraser"></i><br/><br/>
-          <span class="bulk-action-description">${ _('Remove privileges of checkbox selection') }</span>
+          <span class="bulk-action-description">${ _('Delete all privileges of selection') }</span>
         </div>
       </div>
     </div>
@@ -392,7 +392,7 @@ ${ layout.menubar(section='hive') }
   </div>
   <div class="modal-footer">
     <button class="btn" data-dismiss="modal" aria-hidden="true">${ _('Cancel') }</button>
-    <button class="btn" data-bind="css: {'btn-primary': $root.bulkAction() != 'delete', 'btn-danger': $root.bulkAction() == 'delete'}, click: $root.bulkPerfomAction">${ _('Confirm') }</button>
+    <button class="btn" data-bind="enable: $root.bulkAction(), css: {'btn-primary': $root.bulkAction() != 'delete', 'btn-danger': $root.bulkAction() == 'delete'}, click: $root.bulkPerfomAction">${ _('Confirm') }</button>
   </div>
 </div>
 

+ 2 - 2
apps/security/src/security/templates/layout.mako

@@ -63,8 +63,8 @@ def is_selected(section, matcher):
                   ${ _('Hadoop Security') }
                 </a>
               </li>
-              <li class="${is_selected(section, 'hive')}"><a href="${ url('security:hive') }">${_('Hive')}</a></li>
-              <li class="${is_selected(section, 'hdfs')}"><a href="${ url('security:hdfs') }">${_('HDFS')}</a></li>
+              <li class="${is_selected(section, 'hive')}"><a href="${ url('security:hive') }">${_('Databases and Tables')}</a></li>
+              <li class="${is_selected(section, 'hdfs')}"><a href="${ url('security:hdfs') }">${_('Files and Directories')}</a></li>
             </ul>
           </div>
         </div>

+ 2 - 1
apps/security/static/js/hive.ko.js

@@ -924,7 +924,8 @@ var HiveViewModel = function (initial) {
         self.bulk_add_privileges();
         break;
       case "sync":
-        alert("Not supported yet");
+    	self.bulk_delete_privileges();
+    	self.bulk_add_privileges();
         break;
       case "delete":
         self.bulk_delete_privileges();