haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-25 06:33:48 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1803 from haiwen/daily_admin

Browse Source 
[system admin] 'admin role': daily_admin can't manage admins
This commit is contained in:
llj
2017-09-11 11:25:37 +08:00
committed by GitHub
parent 4cae20f376 8c8ce7e815
commit 466bfb3527
7 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
seahub/role_permissions/settings.py
View File

@@ -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,

2
seahub/templates/sysadmin/sys_user_admin_ldap_imported.html
View File

@@ -16,7 +16,9 @@
<li class="tabnav-tab"><a href="{% url 'sys_useradmin' %}">{% trans "Database" %}</a></li>
<li class="tabnav-tab"><a href="{% url 'sys_useradmin_ldap' %}">{% trans "LDAP" %}</a></li>
<li class="tabnav-tab tabnav-tab-cur"><a href="{% url 'sys_useradmin_ldap_imported' %}">{% trans "LDAP(imported)" %}</a></li>
{% if is_default_admin %}
<li class="tabnav-tab"><a href="{% url 'sys_useradmin_admins' %}">{% trans "Admins" %}</a></li>
{% endif %}
</ul>
<div class="js-op-for-all fright">

2
seahub/templates/sysadmin/sys_useradmin.html
View File

@@ -16,7 +16,9 @@
<li class="tabnav-tab"><a href="{% url 'sys_useradmin_ldap' %}">{% trans "LDAP" %}</a></li>
<li class="tabnav-tab"><a href="{% url 'sys_useradmin_ldap_imported' %}">{% trans "LDAP(imported)" %}</a></li>
{% endif %}
{% if is_default_admin %}
<li class="tabnav-tab"><a href="{% url 'sys_useradmin_admins' %}">{% trans "Admins" %}</a></li>
{% endif %}
{% if enable_user_plan %}
<li class="tabnav-tab"><a href="{% url 'sys_useradmin' %}?filter=paid">Paid</a></li>
{% endif %}

2
seahub/templates/sysadmin/sys_useradmin_admins.html
View File

@@ -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" %}
</script>

2
seahub/templates/sysadmin/sys_useradmin_ldap.html
View File

@@ -15,7 +15,9 @@
<li class="tabnav-tab"><a href="{% url 'sys_useradmin' %}">{% trans "Database" %}</a></li>
<li class="tabnav-tab tabnav-tab-cur"><a href="{% url 'sys_useradmin_ldap' %}">{% trans "LDAP" %}</a></li>
<li class="tabnav-tab"><a href="{% url 'sys_useradmin_ldap_imported' %}">{% trans "LDAP(imported)" %}</a></li>
{% if is_default_admin %}
<li class="tabnav-tab"><a href="{% url 'sys_useradmin_admins' %}">{% trans "Admins" %}</a></li>
{% endif %}
</ul>
</div>

2
seahub/templates/sysadmin/sys_useradmin_paid.html
View File

@@ -16,7 +16,9 @@
<li class="tabnav-tab"><a href="{% url 'sys_useradmin_ldap' %}">{% trans "LDAP" %}</a></li>
<li class="tabnav-tab"><a href="{% url 'sys_useradmin_ldap_imported' %}">{% trans "LDAP(imported)" %}</a></li>
{% endif %}
{% if is_default_admin %}
<li class="tabnav-tab"><a href="{% url 'sys_useradmin_admins' %}">{% trans "Admins" %}</a></li>
{% endif %}
{% if enable_user_plan %}
<li class="tabnav-tab tabnav-tab-cur"><a href="{% url 'sys_useradmin' %}?filter=paid">Paid</a></li>
{% endif %}

5
seahub/templates/sysadmin/useradmin_table.html
View File

@@ -72,6 +72,7 @@
<option value={{role}} {%if user.role == role %}selected="selected"{% endif %}>{{ role }}</option>
{% endfor %}
</select>
{% else %} {# else for `if not is_admin_page` #}
<div class="admin-role">
{% if user.admin_role == default_admin %}
@@ -85,11 +86,8 @@
{% else %}
<span class="admin-role-cur-value">{{user.admin_role}}</span>
{% endif %}
{% if request.user.admin_role == default_admin %}
<span title="{% trans "Edit"%}" class="admin-role-edit-icon sf2-icon-edit op-icon vh"></span>
{% endif %}
</div>
{% if request.user.admin_role == default_admin %}
<select name="role" class="admin-role-select hide">
<option value="{{ default_admin }}"{% if user.admin_role == default_admin %} selected="selected"{% endif %}>{% trans "Default Admin" context "Default Administrator" %}</option>
<option value="{{ system_admin }}"{% if user.admin_role == system_admin %} selected="selected"{% endif %}>{% trans "System Admin" context "System Administrator" %}</option>
@@ -100,7 +98,6 @@
{% endfor %}
</select>
{% endif %}
{% endif %}
</td>
{% endif %}
<td style="font-size:11px;">