Pārlūkot izejas kodu

HUE-5964 [useradmin] Port edit permission page to Hue 4

Enrico Berti 8 gadi atpakaļ
vecāks
revīzija
f31a62d

+ 5 - 1
apps/useradmin/src/useradmin/templates/edit_permissions.mako

@@ -20,9 +20,11 @@ from django.utils.translation import ugettext as _
 %>
 <%namespace name="layout" file="layout.mako" />
 
+%if not is_embeddable:
 ${ commonheader(_('Hue Permissions'), "useradmin", user, request) | n,unicode }
-${layout.menubar(section='permissions')}
+%endif
 
+${layout.menubar(section='permissions')}
 
 <%def name="render_field(field)">
   %if not field.is_hidden:
@@ -75,4 +77,6 @@ ${layout.menubar(section='permissions')}
 
 ${layout.commons()}
 
+%if not is_embeddable:
 ${ commonfooter(request, messages) | n,unicode }
+%endif

+ 7 - 1
apps/useradmin/src/useradmin/views.py

@@ -479,7 +479,13 @@ def edit_permission(request, app=None, priv=None):
   else:
     form = PermissionsEditForm(instance=instance)
 
-  return render('edit_permissions.mako', request, dict(form=form, action=request.path, app=app, priv=priv))
+  return render('edit_permissions.mako', request, {
+    'form': form,
+    'action': request.path,
+    'app': app,
+    'priv': priv,
+    'is_embeddable': request.GET.get('is_embeddable', False),
+  })
 
 
 def add_ldap_users(request):

+ 4 - 1
desktop/core/src/desktop/templates/hue.mako

@@ -283,6 +283,7 @@ ${ hueIcons.symbols() }
       <div id="embeddable_useradmin_newgroup" class="embeddable"></div>
       <div id="embeddable_useradmin_editgroup" class="embeddable"></div>
       <div id="embeddable_useradmin_permissions" class="embeddable"></div>
+      <div id="embeddable_useradmin_editpermission" class="embeddable"></div>
       <div id="embeddable_useradmin_configurations" class="embeddable"></div>
       <div id="embeddable_useradmin_newuser" class="embeddable"></div>
       <div id="embeddable_useradmin_addldap" class="embeddable"></div>
@@ -489,6 +490,7 @@ ${ smart_unicode(login_modal(request).content) | n,unicode }
         useradmin_newgroup: '/useradmin/groups/new',
         useradmin_editgroup: '/useradmin/groups/edit/:group',
         useradmin_permissions: '/useradmin/permissions',
+        useradmin_editpermission: '/useradmin/permissions/edit/*',
         useradmin_configurations: '/useradmin/configurations',
         useradmin_newuser: '/useradmin/users/new',
         useradmin_addldap: '/useradmin/users/add_ldap_users',
@@ -505,7 +507,7 @@ ${ smart_unicode(login_modal(request).content) | n,unicode }
         sqoop: '/sqoop',
       };
 
-      var SKIP_CACHE = ['home', 'oozie_workflow', 'oozie_coordinator', 'oozie_bundle', 'dashboard', 'filebrowser', 'useradmin_users', 'useradmin_groups', 'useradmin_newgroup', 'useradmin_editgroup', 'useradmin_permissions', 'useradmin_configurations', 'useradmin_newuser', 'useradmin_addldap', 'useradmin_edituser'];
+      var SKIP_CACHE = ['home', 'oozie_workflow', 'oozie_coordinator', 'oozie_bundle', 'dashboard', 'filebrowser', 'useradmin_users', 'useradmin_groups', 'useradmin_newgroup', 'useradmin_editgroup', 'useradmin_permissions', 'useradmin_editpermission', 'useradmin_configurations', 'useradmin_newuser', 'useradmin_addldap', 'useradmin_edituser'];
 
       var OnePageViewModel = function () {
         var self = this;
@@ -823,6 +825,7 @@ ${ smart_unicode(login_modal(request).content) | n,unicode }
           { url: '/useradmin/groups/new', app: 'useradmin_newgroup' },
           { url: '/useradmin/groups/edit/:group', app: 'useradmin_editgroup' },
           { url: '/useradmin/permissions/', app: 'useradmin_permissions' },
+          { url: '/useradmin/permissions/edit/*', app: 'useradmin_editpermission' },
           { url: '/useradmin/users/', app: 'useradmin_users' },
           { url: '/useradmin/users/add_ldap_users', app: 'useradmin_addldap' },
           { url: '/useradmin/users/edit/:user', app: 'useradmin_edituser' },