浏览代码

HUE-8758 [useradmin] Simplify the titles of the app

Avoid repetition and promote the name of the object instead.
Romain 5 年之前
父节点
当前提交
69e109fe99

+ 5 - 2
apps/useradmin/src/useradmin/models2.py

@@ -16,12 +16,11 @@
 # limitations under the License.
 
 import logging
+import uuid
 
 from django.contrib.auth.models import models, AbstractUser, BaseUserManager
 from django.utils.translation import ugettext_lazy as _t
 
-from desktop.models import uuid_default
-
 
 LOG = logging.getLogger(__name__)
 
@@ -30,6 +29,10 @@ LOG = logging.getLogger(__name__)
 #  Organizations
 # -----------------------------------------------------------------------
 
+def uuid_default():
+  return str(uuid.uuid4())
+
+
 class OrganizationManager(models.Manager):
     use_in_migrations = True
 

+ 6 - 5
apps/useradmin/src/useradmin/templates/edit_group.mako

@@ -31,8 +31,9 @@ else:
 <%namespace name="layout" file="layout.mako" />
 
 % if not is_embeddable:
-${ commonheader(_('Hue Groups'), "useradmin", user, request) | n,unicode }
+  ${ commonheader(_('Groups'), "useradmin", user, request) | n,unicode }
 % endif
+
 ${ layout.menubar(section='groups') }
 
 <%def name="render_field(field)">
@@ -53,12 +54,12 @@ ${ layout.menubar(section='groups') }
 <div id="editGroupComponents" class="useradmin container-fluid">
   <div class="card card-small">
     % if name:
-        <h1 class="card-heading simple">${ _('Hue Groups - Edit group: %(name)s') % {'name': name} }</h1>
+        <h1 class="card-heading simple">${ _('Edit %(name)s') % {'name': name} }</h1>
     % else:
       % if ldap:
-          <h1 class="card-heading simple">${_('Hue Groups - Add/Sync LDAP group')}</h1>
+          <h1 class="card-heading simple">${_('Add/Sync LDAP group')}</h1>
       % else:
-          <h1 class="card-heading simple">${_('Hue Groups - Create group')}</h1>
+          <h1 class="card-heading simple">${_('Create group')}</h1>
       % endif
     % endif
 
@@ -133,5 +134,5 @@ ${ layout.menubar(section='groups') }
 ${ layout.commons() }
 
 % if not is_embeddable:
-${ commonfooter(request, messages) | n,unicode }
+  ${ commonfooter(request, messages) | n,unicode }
 % endif

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

@@ -28,11 +28,11 @@ else:
 
 <%namespace name="layout" file="layout.mako" />
 
-%if not is_embeddable:
-${ commonheader(_('Hue Permissions'), "useradmin", user, request) | n,unicode }
-%endif
+% if not is_embeddable:
+  ${ commonheader(_('Permissions'), "useradmin", user, request) | n,unicode }
+% endif
 
-${layout.menubar(section='permissions')}
+${ layout.menubar(section='permissions') }
 
 <%def name="render_field(field)">
   %if not field.is_hidden:
@@ -51,7 +51,7 @@ ${layout.menubar(section='permissions')}
 
 <div id="editPermissionsComponents" class="useradmin container-fluid">
   <div class="card card-small">
-    <h1 class="card-heading simple">${_('Hue Permissions - Edit app: %(app)s') % dict(app=app)}</h1>
+    <h1 class="card-heading simple">${_('Edit %(app)s') % dict(app=app)}</h1>
     <br/>
 
     <form id="editForm" action="${urllib_quote(action)}" method="POST" class="form form-horizontal">

+ 3 - 3
apps/useradmin/src/useradmin/templates/edit_user.mako

@@ -27,7 +27,7 @@ from useradmin.views import is_user_locked_out
 <%namespace name="layout" file="layout.mako" />
 
 % if not is_embeddable:
-${ commonheader(_('Hue Users'), "useradmin", user, request) | n,unicode }
+${ commonheader(_('Users'), "useradmin", user, request) | n,unicode }
 % endif
 
 ${ layout.menubar(section='users') }
@@ -36,9 +36,9 @@ ${ layout.menubar(section='users') }
 <div id="editUserComponents" class="useradmin container-fluid">
   <div class="card card-small title">
     % if username:
-      <h1 class="card-heading simple">${_('Hue Users - Edit user: %(username)s') % dict(username=username)}</h1>
+      <h1 class="card-heading simple">${_('User %(username)s') % dict(username=username)}</h1>
     % else:
-      <h1 class="card-heading simple">${_('Hue Users - Create user')}</h1>
+      <h1 class="card-heading simple">${_('Create user')}</h1>
     % endif
 
     <br/>

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

@@ -26,14 +26,14 @@ from desktop.views import commonheader, commonfooter, antixss
 <%namespace name="layout" file="layout.mako" />
 
 %if not is_embeddable:
-${ commonheader(_('Hue Groups'), "useradmin", user, request) | n,unicode }
+${ commonheader(_('Groups'), "useradmin", user, request) | n,unicode }
 %endif
 
 ${layout.menubar(section='groups')}
 
 <div id="groupsComponents" class="useradmin container-fluid">
   <div class="card card-small">
-    <h1 class="card-heading simple">${_('Hue Groups')}</h1>
+    <h1 class="card-heading simple">${_('Groups')}</h1>
 
     <%actionbar:render>
       <%def name="search()">

+ 2 - 2
apps/useradmin/src/useradmin/templates/list_permissions.mako

@@ -26,13 +26,13 @@ from useradmin.models import group_permissions, Group
 <%namespace name="layout" file="layout.mako" />
 
 % if not is_embeddable:
-  ${ commonheader(_('Hue Permissions'), "useradmin", user, request) | n,unicode }
+  ${ commonheader(_('Permissions'), "useradmin", user, request) | n,unicode }
 % endif
   ${ layout.menubar(section='permissions') }
 
 <div id="permissionsComponents" class="useradmin container-fluid">
   <div class="card card-small">
-    <h1 class="card-heading simple">${_('Hue Permissions')}</h1>
+    <h1 class="card-heading simple">${_('Permissions')}</h1>
     <%actionbar:render>
       <%def name="search()">
           <input type="text" class="input-xlarge search-query filter-input" placeholder="${_('Search for application, group, etc...')}">

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

@@ -26,14 +26,14 @@ from desktop.auth.backend import is_admin
 <%namespace name="layout" file="layout.mako" />
 
 %if not is_embeddable:
-${ commonheader(_('Hue Users'), "useradmin", user, request) | n,unicode }
+${ commonheader(_('Users'), "useradmin", user, request) | n,unicode }
 %endif
 
 ${layout.menubar(section='users')}
 
 <div id="usersComponents" class="useradmin container-fluid">
   <div class="card card-small">
-    <h1 class="card-heading simple">${_('Hue Users')}</h1>
+    <h1 class="card-heading simple">${_('Users')}</h1>
 
     <%actionbar:render>
       <%def name="search()">

+ 1 - 2
apps/useradmin/src/useradmin/templates/view_user.mako

@@ -20,7 +20,7 @@ from django.utils.translation import ugettext as _
 
 <%namespace name="layout" file="layout.mako" />
 
-${ commonheader(_('Hue Users'), "useradmin", user, request) | n,unicode }
+${ commonheader(_('Users'), "useradmin", user, request) | n,unicode }
 ${ layout.menubar(section='users') }
 
 <div class="useradmin container-fluid">
@@ -40,7 +40,6 @@ ${ layout.menubar(section='users') }
   </div>
 </div>
 
-
 ${layout.commons()}
 
 ${ commonfooter(request, messages) | n,unicode }

+ 4 - 3
desktop/core/src/desktop/middleware.py

@@ -265,15 +265,16 @@ class AppSpecificMiddleware(object):
 
 
 class LoginAndPermissionMiddleware(object):
+  """
+  Middleware that forces all views (except those that opt out) through authentication.
+  """
+
   def process_request(self, request):
     # When local user login, oidc middleware refresh token if oidc_id_token_expiration doesn't exists!
     if request.session.get('_auth_user_backend', '') == 'desktop.auth.backend.AllowFirstUserDjangoBackend'\
             and 'desktop.auth.backend.OIDCBackend' in desktop.conf.AUTH.BACKEND.get():
       request.session['oidc_id_token_expiration'] = time.time() + 300
 
-  """
-  Middleware that forces all views (except those that opt out) through authentication.
-  """
   def process_view(self, request, view_func, view_args, view_kwargs):
     """
     We also perform access logging in ``process_view()`` since we have the view function,