Browse Source

[sentry] Update role when trying to create one with existing name

Romain Rigaux 11 years ago
parent
commit
25e1612

+ 1 - 1
apps/security/src/security/api/hive.py

@@ -176,7 +176,7 @@ def save_privileges(request):
       if privilege['id'] in old_privileges_ids:
         _drop_sentry_privilege(request.user, role, privilege)
 
-    result['message'] = ''
+    result['message'] = _('Privileges updated')
     result['status'] = 0
   except Exception, e:
     result['message'] = unicode(str(e), "utf8")

+ 12 - 4
apps/security/src/security/templates/hive.mako

@@ -400,10 +400,18 @@ ${ layout.menubar(section='hive') }
       <div class="span4">
         <h4>${ _('to apply to the selection') }</h4>
         <ul class="unstyled modal-panel" data-bind="foreach: $root.assist.checkedItems">
-          <li data-bind="visible: path.indexOf('.') > -1" class="force-word-break"><i class="fa fa-database muted"></i> <span data-bind="text: path.split('.')[0]"></span> <i class="fa fa-long-arrow-right muted"></i> <i class="fa fa-table muted"></i> <span data-bind="text: path.split('.')[1]"></span></li>
-          <li data-bind="visible: path.indexOf('.') == -1" class="force-word-break"><i class="fa fa-database muted"></i> <span data-bind="text: path.split('.')[0]"></span></li>
+          <li data-bind="visible: path.indexOf('.') > -1" class="force-word-break">
+            <i class="fa fa-database muted"></i>
+            <span data-bind="text: path.split('.')[0]"></span>
+            <i class="fa fa-long-arrow-right muted"></i>
+            <i class="fa fa-table muted"></i>
+            <span data-bind="text: path.split('.')[1]"></span>
+          </li>
+          <li data-bind="visible: path.indexOf('.') == -1" class="force-word-break">
+            <i class="fa fa-database muted"></i> <span data-bind="text: path.split('.')[0]"></span>
+          </li>
         </ul>
-      </div>      
+      </div>
     </div>
     <br/>
     <div class="row-fluid" data-bind="visible: $root.bulkAction() != '' && $root.bulkAction() != 'delete'">
@@ -632,7 +640,7 @@ ${ tree.import_templates(itemClick='$root.assist.setPath', iconClick='$root.assi
             },
             'updater': function(item) {
                 return item;
-             }
+            }
         });
       });
       $(document).on("destroy.typeahead", function(){

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

@@ -258,16 +258,15 @@ var Role = function (vm, role) {
 
   self.update = function () {
     $(".jHueNotify").hide();
-    $.post("/security/api/hive/update_role", {
+    $.post("/security/api/hive/save_privileges", {
       role: ko.mapping.toJSON(self)
     }, function (data) {
       if (data.status == 0) {
         $(document).trigger("info", data.message);
         vm.showCreateRole(false);
-        self.reset();
         vm.assist.refreshTree();
         vm.refreshExpandedRoles();
-        $(document).trigger("updated.role");
+        $(document).trigger("created.role");
       } else {
         $(document).trigger("error", data.message);
       }

+ 0 - 2
desktop/libs/libsentry/src/libsentry/api.py

@@ -133,8 +133,6 @@ class SentryApi(object):
   def list_sentry_privileges_by_authorizable(self, authorizableSet, groups=None, roleSet=None):
     response = self.client.list_sentry_privileges_by_authorizable(authorizableSet, groups, roleSet)
 
-    print response
-
     _privileges = []
 
     for authorizable, roles in response.privilegesMapByAuth.iteritems():