Răsfoiți Sursa

HUE-5964 [useradmin] Port new group page to Hue 4

Enrico Berti 8 ani în urmă
părinte
comite
ac2de54020

+ 4 - 1
apps/useradmin/src/useradmin/templates/edit_group.mako

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

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

@@ -434,7 +434,12 @@ def edit_group(request, name=None):
   else:
     form = GroupEditForm(instance=instance)
 
-  return render('edit_group.mako', request, dict(form=form, action=request.path, name=name))
+  return render('edit_group.mako', request, {
+    'form': form,
+    'action': request.path,
+    'name': name,
+    'is_embeddable': request.GET.get('is_embeddable', False),
+  })
 
 
 def edit_permission(request, app=None, priv=None):

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

@@ -280,6 +280,7 @@ ${ hueIcons.symbols() }
       <div id="embeddable_indexes" class="embeddable"></div>
       <div id="embeddable_useradmin_users" class="embeddable"></div>
       <div id="embeddable_useradmin_groups" class="embeddable"></div>
+      <div id="embeddable_useradmin_newgroup" class="embeddable"></div>
       <div id="embeddable_useradmin_permissions" class="embeddable"></div>
       <div id="embeddable_useradmin_configurations" class="embeddable"></div>
       <div id="embeddable_useradmin_newuser" class="embeddable"></div>
@@ -484,6 +485,7 @@ ${ smart_unicode(login_modal(request).content) | n,unicode }
         importer: '/indexer/importer/',
         useradmin_users: '/useradmin/users',
         useradmin_groups: '/useradmin/groups',
+        useradmin_newgroup: '/useradmin/groups/new',
         useradmin_permissions: '/useradmin/permissions',
         useradmin_configurations: '/useradmin/configurations',
         useradmin_newuser: '/useradmin/users/new',
@@ -501,7 +503,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_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_permissions', 'useradmin_configurations', 'useradmin_newuser', 'useradmin_addldap', 'useradmin_edituser'];
 
       var OnePageViewModel = function () {
         var self = this;
@@ -816,6 +818,7 @@ ${ smart_unicode(login_modal(request).content) | n,unicode }
           { url: '/sqoop', app: 'sqoop' },
           { url: '/useradmin/configurations/', app: 'useradmin_configurations' },
           { url: '/useradmin/groups/', app: 'useradmin_groups' },
+          { url: '/useradmin/groups/new', app: 'useradmin_newgroup' },
           { url: '/useradmin/permissions/', app: 'useradmin_permissions' },
           { url: '/useradmin/users/', app: 'useradmin_users' },
           { url: '/useradmin/users/add_ldap_users', app: 'useradmin_addldap' },