Browse Source

HUE-8530 [organization] List organization name when editing users and groups

Romain 5 years ago
parent
commit
6da571b558

+ 1 - 1
apps/useradmin/src/useradmin/models2.py

@@ -70,7 +70,7 @@ if ENABLE_ORGANIZATIONS.get():
     objects = OrganizationManager()
 
     def __str__(self):
-      return self.name
+      return self.name or self.domain
 
 
 class OrganizationGroupManager(models.Manager):

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

@@ -18,6 +18,7 @@ import sys
 
 from django.utils.translation import ugettext as _
 
+from desktop.conf import ENABLE_ORGANIZATIONS
 from desktop.lib.django_util import extract_field_data
 from desktop.views import commonheader, commonfooter
 
@@ -54,7 +55,12 @@ ${ layout.menubar(section='groups') }
 <div id="editGroupComponents" class="useradmin container-fluid">
   <div class="card card-small">
     % if name:
-        <h1 class="card-heading simple">${ _('Edit %(name)s') % {'name': name} }</h1>
+        <h1 class="card-heading simple">
+          ${ _('Edit %(name)s') % {'name': name} }
+          % if ENABLE_ORGANIZATIONS.get():
+            @ ${ user.organization }
+          % endif
+        </h1>
     % else:
       % if ldap:
           <h1 class="card-heading simple">${_('Add/Sync LDAP group')}</h1>

+ 9 - 2
apps/useradmin/src/useradmin/templates/edit_permissions.mako

@@ -16,9 +16,11 @@
 <%!
 import sys
 
-from desktop.views import commonheader, commonfooter
 from django.utils.translation import ugettext as _
 
+from desktop.conf import ENABLE_ORGANIZATIONS
+from desktop.views import commonheader, commonfooter
+
 if sys.version_info[0] > 2:
   from urllib.parse import quote as urllib_quote
   unicode = str
@@ -51,7 +53,12 @@ ${ layout.menubar(section='permissions') }
 
 <div id="editPermissionsComponents" class="useradmin container-fluid">
   <div class="card card-small">
-    <h1 class="card-heading simple">${_('Edit %(app)s') % dict(app=app)}</h1>
+    <h1 class="card-heading simple">
+      ${_('Edit %(app)s') % dict(app=app)}
+      % if ENABLE_ORGANIZATIONS.get():
+        @ ${ user.organization }
+      % endif
+    </h1>
     <br/>
 
     <form id="editForm" action="${urllib_quote(action)}" method="POST" class="form form-horizontal">

+ 6 - 1
apps/useradmin/src/useradmin/templates/edit_user.mako

@@ -36,7 +36,12 @@ ${ layout.menubar(section='users') }
 <div id="editUserComponents" class="useradmin container-fluid">
   <div class="card card-small title">
     % if username:
-      <h1 class="card-heading simple">${_('User %(username)s') % dict(username=username)}</h1>
+      <h1 class="card-heading simple">
+        ${_('User %(username)s') % dict(username=username)}
+        % if ENABLE_ORGANIZATIONS.get():
+          @ ${ user.organization }
+        % endif
+      </h1>
     % else:
       <h1 class="card-heading simple">${_('Create user')}</h1>
     % endif

+ 10 - 3
apps/useradmin/src/useradmin/templates/list_groups.mako

@@ -15,10 +15,12 @@
 ## limitations under the License.
 <%!
 from django.utils.translation import ugettext as _
-from useradmin.models import group_permissions
-from desktop.auth.backend import is_admin
 
+from desktop.auth.backend import is_admin
+from desktop.conf import ENABLE_ORGANIZATIONS
 from desktop.views import commonheader, commonfooter, antixss
+
+from useradmin.models import group_permissions
 %>
 
 
@@ -33,7 +35,12 @@ ${layout.menubar(section='groups')}
 
 <div id="groupsComponents" class="useradmin container-fluid">
   <div class="card card-small">
-    <h1 class="card-heading simple">${_('Groups')}</h1>
+    <h1 class="card-heading simple">
+      ${_('Groups')}
+      % if ENABLE_ORGANIZATIONS.get():
+        @ ${ user.organization }
+      % endif
+    </h1>
 
     <%actionbar:render>
       <%def name="search()">

+ 8 - 1
apps/useradmin/src/useradmin/templates/list_permissions.mako

@@ -17,6 +17,7 @@
 from django.utils.translation import ugettext as _
 
 from desktop.auth.backend import is_admin
+from desktop.conf import ENABLE_ORGANIZATIONS
 from desktop.views import commonheader, commonfooter
 
 from useradmin.models import group_permissions, Group
@@ -32,7 +33,13 @@ from useradmin.models import group_permissions, Group
 
 <div id="permissionsComponents" class="useradmin container-fluid">
   <div class="card card-small">
-    <h1 class="card-heading simple">${_('Permissions')}</h1>
+    <h1 class="card-heading simple">
+      ${_('Permissions')}
+      % if ENABLE_ORGANIZATIONS.get():
+        @ ${ user.organization }
+      % endif
+    </h1>
+
     <%actionbar:render>
       <%def name="search()">
           <input type="text" class="input-xlarge search-query filter-input" placeholder="${_('Search for application, group, etc...')}">

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

@@ -17,9 +17,10 @@
 from django.template.defaultfilters import date, time
 from django.utils.translation import ugettext as _
 
+from desktop.auth.backend import is_admin
+from desktop.conf import ENABLE_ORGANIZATIONS
 from desktop.lib.django_util import USERNAME_RE_RULE
 from desktop.views import commonheader, commonfooter, antixss
-from desktop.auth.backend import is_admin
 %>
 
 <%namespace name="actionbar" file="actionbar.mako" />
@@ -33,7 +34,12 @@ ${layout.menubar(section='users')}
 
 <div id="usersComponents" class="useradmin container-fluid">
   <div class="card card-small">
-    <h1 class="card-heading simple">${_('Users')}</h1>
+    <h1 class="card-heading simple">
+      ${_('Users')}
+      % if ENABLE_ORGANIZATIONS.get():
+        @ ${ user.organization }
+      % endif
+    </h1>
 
     <%actionbar:render>
       <%def name="search()">