diff --git a/seahub/role_permissions/settings.py b/seahub/role_permissions/settings.py index 85a708eb56..3ca240ac5f 100644 --- a/seahub/role_permissions/settings.py +++ b/seahub/role_permissions/settings.py @@ -88,7 +88,7 @@ DEFAULT_ENABLED_ADMIN_ROLE_PERMISSIONS = { 'can_config_system': True, }, # DAILY_ADMIN can ONLY view system-info(without upload licence), statistic, - # libraries/users/groups, user-logs pages. + # libraries, users(except 'Admins'), groups, user-logs pages. DAILY_ADMIN: { 'can_view_system_info': True, 'can_view_statistic': True, diff --git a/seahub/templates/sysadmin/sys_user_admin_ldap_imported.html b/seahub/templates/sysadmin/sys_user_admin_ldap_imported.html index 8ba273e895..e11ad93ddb 100644 --- a/seahub/templates/sysadmin/sys_user_admin_ldap_imported.html +++ b/seahub/templates/sysadmin/sys_user_admin_ldap_imported.html @@ -16,7 +16,9 @@
  • {% trans "Database" %}
  • {% trans "LDAP" %}
  • {% trans "LDAP(imported)" %}
  • + {% if is_default_admin %}
  • {% trans "Admins" %}
  • + {% endif %}
    diff --git a/seahub/templates/sysadmin/sys_useradmin.html b/seahub/templates/sysadmin/sys_useradmin.html index 6b15a826e9..ec14e8c54b 100644 --- a/seahub/templates/sysadmin/sys_useradmin.html +++ b/seahub/templates/sysadmin/sys_useradmin.html @@ -16,7 +16,9 @@
  • {% trans "LDAP" %}
  • {% trans "LDAP(imported)" %}
  • {% endif %} + {% if is_default_admin %}
  • {% trans "Admins" %}
  • + {% endif %} {% if enable_user_plan %}
  • Paid
  • {% endif %} diff --git a/seahub/templates/sysadmin/sys_useradmin_admins.html b/seahub/templates/sysadmin/sys_useradmin_admins.html index 5d587f8340..bec83da4e8 100644 --- a/seahub/templates/sysadmin/sys_useradmin_admins.html +++ b/seahub/templates/sysadmin/sys_useradmin_admins.html @@ -100,7 +100,6 @@ $('#add-admin-form').submit(function() { return false; }); -{% if request.user.admin_role == default_admin %} $('.admin-role-select').change(function() { var $select = $(this), role = $select.val(), @@ -131,7 +130,6 @@ $('.admin-role-select').change(function() { } }); }); -{% endif %} {% include "sysadmin/useradmin_js.html" %} diff --git a/seahub/templates/sysadmin/sys_useradmin_ldap.html b/seahub/templates/sysadmin/sys_useradmin_ldap.html index bc6ee3f4a4..c6cd186504 100644 --- a/seahub/templates/sysadmin/sys_useradmin_ldap.html +++ b/seahub/templates/sysadmin/sys_useradmin_ldap.html @@ -15,7 +15,9 @@
  • {% trans "Database" %}
  • {% trans "LDAP" %}
  • {% trans "LDAP(imported)" %}
  • + {% if is_default_admin %}
  • {% trans "Admins" %}
  • + {% endif %}
    diff --git a/seahub/templates/sysadmin/sys_useradmin_paid.html b/seahub/templates/sysadmin/sys_useradmin_paid.html index 578e1b3b2b..5523549e2e 100644 --- a/seahub/templates/sysadmin/sys_useradmin_paid.html +++ b/seahub/templates/sysadmin/sys_useradmin_paid.html @@ -16,7 +16,9 @@
  • {% trans "LDAP" %}
  • {% trans "LDAP(imported)" %}
  • {% endif %} + {% if is_default_admin %}
  • {% trans "Admins" %}
  • + {% endif %} {% if enable_user_plan %}
  • Paid
  • {% endif %} diff --git a/seahub/templates/sysadmin/useradmin_table.html b/seahub/templates/sysadmin/useradmin_table.html index 09a121b7b3..af25d099ae 100644 --- a/seahub/templates/sysadmin/useradmin_table.html +++ b/seahub/templates/sysadmin/useradmin_table.html @@ -72,6 +72,7 @@ {% endfor %} + {% else %} {# else for `if not is_admin_page` #}
    {% if user.admin_role == default_admin %} @@ -85,11 +86,8 @@ {% else %} {{user.admin_role}} {% endif %} - {% if request.user.admin_role == default_admin %} - {% endif %}
    - {% if request.user.admin_role == default_admin %} {% endif %} - {% endif %} {% endif %}