Browse Source

HUE-5964 [responsive] Added user list

Enrico Berti 8 years ago
parent
commit
a0e39e7dd0

+ 6 - 2
apps/useradmin/src/useradmin/templates/list_users.mako

@@ -21,10 +21,12 @@ from django.utils.translation import ugettext as _
 
 <%namespace name="actionbar" file="actionbar.mako" />
 <%namespace name="layout" file="layout.mako" />
+%if not is_embeddable:
 ${ commonheader(_('Hue Users'), "useradmin", user, request) | n,unicode }
+%endif
 ${layout.menubar(section='users')}
 
-<div class="container-fluid">
+<div id="usersComponents" class="container-fluid">
   <div class="card card-small">
     <h1 class="card-heading simple">${_('Hue Users')}</h1>
 
@@ -215,7 +217,7 @@ ${layout.menubar(section='users')}
 
     viewModel.init();
 
-    ko.applyBindings(viewModel);
+    ko.applyBindings(viewModel, $('#usersComponents')[0]);
 
     $(".confirmationModal").click(function () {
       var _this = $(this);
@@ -241,4 +243,6 @@ ${layout.menubar(section='users')}
 
 ${layout.commons()}
 
+%if not is_embeddable:
 ${ commonfooter(request, messages) | n,unicode }
+%endif

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

@@ -68,6 +68,7 @@ def list_users(request):
       'users': users,
       'users_json': json.dumps(list(User.objects.values_list('id', flat=True))),
       'request': request,
+      'is_embeddable': request.GET.get('is_embeddable', False),
       'is_ldap_setup': is_ldap_setup
   })
 

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

@@ -312,6 +312,7 @@ ${ hueIcons.symbols() }
         <li data-bind="click: function () { onePageViewModel.currentApp('metastore') }"><a href="javascript: void(0);">Tables</a></li>
         <li data-bind="click: function () { onePageViewModel.currentApp('indexes') }"><a href="javascript: void(0);">Indexes</a></li>
         <li data-bind="click: function () { onePageViewModel.currentApp('jobbrowser') }"><a href="javascript: void(0);">Jobs</a></li>
+        <li data-bind="click: function () { onePageViewModel.currentApp('users') }"><a href="javascript: void(0);">Users</a></li>
         <li><a href="javascript: void(0);">HBase</a></li>
         <li><a href="javascript: void(0);">Security</a></li>
         <li class="header">&nbsp;</li>
@@ -373,6 +374,7 @@ ${ hueIcons.symbols() }
       <div id="embeddable_importer" class="embeddable"></div>
       <div id="embeddable_collections" class="embeddable"></div>
       <div id="embeddable_indexes" class="embeddable"></div>
+      <div id="embeddable_users" class="embeddable"></div>
     </div>
 
     <div id="rightResizer" class="resizer" data-bind="visible: rightAssistVisible(), splitFlexDraggable : {
@@ -580,9 +582,10 @@ ${ assist.assistPanel() }
           collections: '/dashboard/admin/collections?is_embeddable=true',
           indexes: '/indexer/?is_embeddable=true',
           importer: '/indexer/importer/?is_embeddable=true',
+          users: '/useradmin/users?is_embeddable=true',
         };
 
-        self.SKIP_CACHE = ['fileviewer'];
+        self.SKIP_CACHE = ['fileviewer', 'users'];
 
         self.embeddable_cache = {};