瀏覽代碼

HUE-5964 [useradmin] Ported list of groups

Enrico Berti 8 年之前
父節點
當前提交
0c60283
共有 2 個文件被更改,包括 12 次插入3 次删除
  1. 6 2
      apps/useradmin/src/useradmin/templates/list_groups.mako
  2. 6 1
      apps/useradmin/src/useradmin/views.py

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

@@ -22,10 +22,12 @@ from useradmin.models import group_permissions
 
 <%namespace name="actionbar" file="actionbar.mako" />
 <%namespace name="layout" file="layout.mako" />
+%if not is_embeddable:
 ${ commonheader(_('Hue Groups'), "useradmin", user, request) | n,unicode }
+%endif
 ${layout.menubar(section='groups')}
 
-<div class="container-fluid">
+<div id="groupsComponents" class="container-fluid">
   <div class="card card-small">
     <h1 class="card-heading simple">${_('Hue Groups')}</h1>
 
@@ -134,7 +136,7 @@ ${layout.menubar(section='groups')}
 
   $(document).ready(function () {
 
-    ko.applyBindings(viewModel);
+    ko.applyBindings(viewModel, $('#groupsComponents')[0]);
 
     mainDataTable = $(".datatables").dataTable({
       "sPaginationType":"bootstrap",
@@ -208,4 +210,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

@@ -75,9 +75,14 @@ def list_users(request):
 
 def list_groups(request):
   is_ldap_setup = bool(LDAP.LDAP_SERVERS.get()) or LDAP.LDAP_URL.get() is not None
+  groups = Group.objects.all()
+  if request.GET.get('format') == 'json':
+    return JsonResponse({'grups' : massage_groups_for_json(groups)})
+
   return render("list_groups.mako", request, {
-      'groups': Group.objects.all(),
+      'groups': groups,
       'groups_json': json.dumps(list(Group.objects.values_list('name', flat=True))),
+      'is_embeddable': request.GET.get('is_embeddable', False),
       'is_ldap_setup': is_ldap_setup
   })