add admin role/login feature #1784

imwhatiam · 2017-08-30T08:13:15Z

No description provided.

xiez · 2017-09-06T09:20:26Z

seahub/base/accounts.py

@@ -101,6 +105,14 @@ def get(self, email=None, id=None):
        user.source = emailuser.source
        user.role = emailuser.role

+        try:


普通用户需要设置admin role 字段？

xiez · 2017-09-06T09:21:49Z

seahub/base/accounts.py

@@ -408,6 +451,14 @@ def get_user_with_import(self, username):
        user.source = emailuser.source
        user.role = emailuser.role

+        try:


xiez · 2017-09-06T09:33:32Z

seahub/templates/js/sysadmin-templates.html

@@ -4,74 +4,108 @@
    <a href="#" title="{% trans "Close" %}" aria-label="{% trans "Close" %}" class="sf2-icon-x1 sf-popover-close op-icon hidden-md-up js-close-side-nav fright"></a>
    <h3 class="hd">{% trans "System Admin" %}</h3>
    <ul class="side-tabnav-tabs">
+
+        {% if admin_permissions.can_view_system_info %}


用 request.user.admin_permission...，这样就不需要context processor

llj · 2017-09-07T08:30:38Z

seahub/api2/endpoints/admin/admin_role.py

+        return Response(result)
+
+    def post(self, request):
+        """ Add an role for an admin user.


'an role' --> 'a role'

llj · 2017-09-07T08:32:17Z

seahub/api2/endpoints/admin/admin_role.py

+        return Response(result)
+
+    def put(self, request):
+        """ Update an role for an admin user.


'an role' --> 'a role'

llj · 2017-09-07T09:49:44Z

seahub/templates/js/sysadmin-templates.html

+    <div class="hd ovhd">
+        <ul class="tab-tabs-nav fleft">
+            <li class="tab <% if (cur_tab == 'admin_logs') { %> ui-state-active <% } %>">
+                <a href="#admin-logs/" class="a">{% trans "Admin Logs" %}</a>


"Admin Logs" --> "Admin Operation Logs"

llj · 2017-09-07T09:50:39Z

seahub/templates/js/sysadmin-templates.html

+    <div class="hd ovhd">
+        <ul class="tab-tabs-nav fleft">
+            <li class="tab <% if (cur_tab == 'admin_logs') { %> ui-state-active <% } %>">
+                <a href="#admin-logs/" class="a">{% trans "Admin Logs" %}</a>


"Admin Logs" --> "Admin Operation Logs"

#admin-logs/

llj · 2017-09-07T10:19:00Z

seahub/templates/js/sysadmin-templates.html

+<script type="text/template" id="admin-login-logs-tmpl">
+    <div class="hd ovhd">
+        <ul class="tab-tabs-nav fleft">
+            <li class="tab <% if (cur_tab == 'admin_logs') { %> ui-state-active <% } %>">


是否 cur_tab 是确定的。

llj · 2017-09-07T10:24:40Z

seahub/templates/js/sysadmin-templates.html

+        <thead>
+            <tr>
+                <th width="35%">{% trans "Email" %}</th>
+                <th width="25%">{% trans "IP" %}</th>


需要 trans ?

llj · 2017-09-07T10:29:26Z

seahub/templates/js/sysadmin-templates.html

+    <td>{% trans "Success" %}</td>
+    <% } else { %>
+    <td>{% trans "Failed" %}</td>
+    <% } %>


llj · 2017-09-08T07:13:22Z

seahub/templates/js/sysadmin-templates.html

+        <li class="tab">
+            <a href="{{ SITE_ROOT }}sys/trafficadmin/"><span class="sf2-icon-histogram"></span>{% trans "Traffic" %}</a>
+        </li>
+        {% endif %}


'Traffic' is moved into 'Statistic'. Remove it.

llj · 2017-09-08T07:14:11Z

seahub/templates/sysadmin/base.html

+            <li class="tab {% block cur_traffic %}{% endblock %}">
+                <a href="{{ SITE_ROOT }}sys/trafficadmin/"><span class="sf2-icon-histogram"></span>{% trans "Traffic" %}</a>
+            </li>
+            {% endif %}


'Traffic' is moved into 'Statistic'. Remove it.

llj · 2017-09-08T07:25:46Z

seahub/templates/sysadmin/sys_useradmin_admins.html

@@ -86,7 +86,9 @@ <h3 class="hd">{% trans "Add admins"%}</h3>
        },
        error: function(xhr) {
            var error_msg;
-            if (xhr.responseText) {
+            if (xhr.status === 403) {
+                error_msg = 'Permission denied.'


llj · 2017-09-08T07:33:32Z

seahub/templates/sysadmin/sysadmin_backbone.html

+        "can_manage_user": '{{ user.admin_permissions.can_manage_user }}' === 'True',
+        "can_manage_group": '{{ user.admin_permissions.can_manage_group }}' === 'True',
+        "can_view_user_log": '{{ user.admin_permissions.can_view_user_log }}' === 'True',
+        "can_view_admin_log": '{{ user.admin_permissions.can_view_admin_log }}' === 'True'


llj · 2017-09-08T08:14:31Z

seahub/templates/sysadmin/useradmin_js.html

@@ -86,6 +86,37 @@
    });
 });

+$('.admin-role-select').change(function() {
+    var select = $(this),


llj · 2017-09-08T08:20:12Z

seahub/templates/sysadmin/useradmin_js.html

@@ -86,6 +86,37 @@
    });
 });

+$('.admin-role-select').change(function() {
+    var select = $(this),
+        select_val = select.val(),


select_val --> role

llj · 2017-09-08T08:23:58Z

seahub/templates/sysadmin/useradmin_js.html

+        beforeSend: prepareCSRFToken,
+        success: function(data) {
+            feedback("{% trans "Edit succeeded" %}", 'success');
+            $('.admin-role-cur-value', $select_prev).html(select.children('option[value="' +select.val() + '"]').text());


+select.val() + 后加空格。

llj · 2017-09-08T08:27:38Z

seahub/templates/sysadmin/useradmin_js.html

@@ -86,6 +86,37 @@
    });
 });

+$('.admin-role-select').change(function() {


put it into 'admin' page.

llj · 2017-09-08T08:33:20Z

seahub/templates/sysadmin/useradmin_table.html

-        <th width="33%">{% trans "Email" %} / {% trans "Name" %} / {% trans "Contact Email" %}</th>
-        <th width="12%">{% trans "Status" %}</th>
+        <th width="34%">{% trans "Email" %} / {% trans "Name" %} / {% trans "Contact Email" %}</th>
+        <th width="14%">{% trans "Status" %}</th>


上面的 width 值，原来总值是 45%, 你改完变成 48% 了。原来是对的。

llj · 2017-09-08T08:52:59Z

seahub/templates/sysadmin/useradmin_table.html

+                {% elif user.admin_role == daily_admin %}
+                    <span class="admin-role-cur-value">{% trans "Daily Administrator" %}</span>
+                {% elif user.admin_role == audit_admin %}
+                    <span class="admin-role-cur-value">{% trans "Audit Administrator" %}</span>


'Administrator' --> 'Admin'. add 'context' for 'trans'.

{% trans "Default Admin" context "Default Administrator" %}

llj · 2017-09-08T09:11:39Z

seahub/templates/sysadmin/useradmin_table.html

+                <option value={{ daily_admin }}{% if user.admin_role == daily_admin %} selected="selected"{% endif %}>{% trans "Daily Administrator" %}</option>
+                <option value={{ audit_admin }}{% if user.admin_role == audit_admin %} selected="selected"{% endif %}>{% trans "Audit Administrator" %}</option>
+                {% for role in extra_admin_roles %}
+                <option value={{ role }}{% if user.admin_role == role %} selected="selected"{% endif %}>{{ role }}</option>


value={{ ... }} --> value="{{ ... }}". 引号加上。上面5行。

llj · 2017-09-08T09:18:01Z

seahub/views/sysadmin.py

+            user.admin_role = DEFAULT_ADMIN
+
+    extra_admin_roles = [x for x in get_available_admin_roles()
+                        if x not in get_basic_admin_roles()]


mark. be simpler?

llj · 2017-09-08T09:54:11Z

seahub/views/sysadmin.py

-    ldpa_imported_users = seaserv.get_emailusers('LDAPImport', -1, -1)
+
+    db_users = ccnet_api.get_emailusers('DB', -1, -1)
+    ldpa_imported_users = ccnet_api.get_emailusers('LDAPImport', -1, -1)


ldpa_... --> ldap_...

llj · 2017-09-08T10:01:58Z

static/scripts/sysadmin-app/models/admin-login-log.js

+define([
+    'underscore',
+    'backbone',
+    'common',


逗号删了。

llj · 2017-09-08T10:26:27Z

static/scripts/sysadmin-app/views/admin-login-logs.js

+            }
+        },
+
+        addOne: function(login) {


llj · 2017-09-09T02:13:17Z

seahub/api2/endpoints/admin/admin_role.py

+
+        Permission checking:
+        1. only admin can perform this action.
+        2. email(from argument): must be a admin user.


llj · 2017-09-09T02:19:59Z

seahub/api2/endpoints/admin/admin_role.py

+        ## 2. email(from argument): must be a admin user.
+        if not user.is_staff:
+            error_msg = "%s must be an administrator." % email
+            return api_error(status.HTTP_403_FORBIDDEN, error_msg)


##1 & ##2 顺序换下。

llj · 2017-09-09T02:26:12Z

seahub/api2/endpoints/admin/admin_role.py

+
+        Permission checking:
+        1. only admin with `default_admin` role can perform this action.
+        2. email(from argument): must be a admin user.


llj · 2017-09-09T02:27:02Z

seahub/api2/endpoints/admin/admin_role.py

+        ## 2. email(from argument): must be a admin user.
+        if not user.is_staff:
+            error_msg = "%s must be an administrator." % email
+            return api_error(status.HTTP_403_FORBIDDEN, error_msg)


##1 & ##2 顺序换下

llj · 2017-09-09T02:52:19Z

seahub/api2/endpoints/admin/login_logs.py

+
+class LoginLogs(APIView):
+
+    authentication_classes = (TokenAuthentication, SessionAuthentication )


) 前有个空格。

llj · 2017-09-09T02:58:49Z

seahub/api2/endpoints/admin/login_logs.py

+from seahub.api2.utils import api_error
+
+from seahub.api2.endpoints.utils import get_user_name_dict, \
+        get_user_contact_email_dict


这两行可以和上面的 line 13 合并。

llj · 2017-09-09T03:13:20Z

seahub/base/middleware.py

+
+        permission_url = {
+            'can_view_system_info': [
+                'sys/settings',


llj · 2017-09-09T03:15:28Z

seahub/base/middleware.py

+                'api/v2.1/admin/favicon',
+                'api/v2.1/admin/license',
+                'api/v2.1/admin/login-background-image',
+            ],


llj · 2017-09-09T03:17:36Z

seahub/role_permissions/models.py

+        return amdin_role
+
+    def get_admin_role(self, username):
+        """ Get admin role of an user.


llj · 2017-09-09T03:31:33Z

seahub/role_permissions/settings.py

+        'can_view_user_log': True,
+        'can_view_admin_log': True,
+    },
+    # SYSTEM_ADMIN can ONLY view system-info(without upload licence), settings pages.


mark.
'upload licence'

llj · 2017-09-09T03:59:10Z

seahub/templates/sysadmin/sysadmin_backbone.html

+        "can_manage_user": {% if user.admin_permissions.can_manage_user %} true {% else %} false {% endif %},
+        "can_manage_group": {% if user.admin_permissions.can_manage_group %} true {% else %} false {% endif %},
+        "can_view_user_log": {% if user.admin_permissions.can_view_user_log %} true {% else %} false {% endif %},
+        "can_view_admin_log": {% if user.admin_permissions.can_view_admin_log %} true {% else %} false {% endif %},


逗号删了。

llj · 2017-09-09T04:06:32Z

seahub/templates/sysadmin/useradmin_table.html

+                <option value={{ daily_admin }}{% if user.admin_role == daily_admin %} selected="selected"{% endif %}>{% trans "Daily Admin" context "Daily Administrator" %}</option>
+                <option value={{ audit_admin }}{% if user.admin_role == audit_admin %} selected="selected"{% endif %}>{% trans "Audit Admin" context "Audit Administrator" %}</option>
+                {% for role in extra_admin_roles %}
+                <option value={{ role }}{% if user.admin_role == role %} selected="selected"{% endif %}>{{ role }}</option>


上面 5 行， value={{...}} --> value="{{...}}", 加引号

llj · 2017-09-09T04:09:15Z

seahub/urls.py

@@ -313,7 +313,10 @@

    ## admin::shares
    url(r'^api/v2.1/admin/shares/$', AdminShares.as_view(), name='api-v2.1-admin-shares'),
-    url(r'^api/v2.1/admin/admin-logs/$', AdminLogs.as_view(), name='api-v2.1-admin-admin-logs'),
+
+    ## admin::admin operation logs


rm 'operation'

llj · 2017-09-09T06:02:31Z

seahub/templates/sysadmin/useradmin_table.html

+                {% else %}
+                    <span class="admin-role-cur-value">{{user.admin_role}}</span>
+                {% endif %}
+                <span title="{% trans "Edit"%}" class="admin-role-edit-icon sf2-icon-edit op-icon vh"></span>


这里要加上权限判断：default_admin 才可以编辑。

相应的 js 部分也加上吧。

imwhatiam force-pushed the admin-role-log branch 4 times, most recently from e12edda to b618b45 Compare September 5, 2017 06:30

xiez reviewed Sep 6, 2017

View reviewed changes

imwhatiam force-pushed the admin-role-log branch from b618b45 to 6c95d82 Compare September 7, 2017 05:49

llj reviewed Sep 7, 2017

View reviewed changes

imwhatiam force-pushed the admin-role-log branch from 71dd56a to 6324e65 Compare September 7, 2017 10:27

llj reviewed Sep 7, 2017

View reviewed changes

imwhatiam force-pushed the admin-role-log branch 2 times, most recently from 80f52bf to 949af15 Compare September 7, 2017 11:05

llj reviewed Sep 8, 2017

View reviewed changes

static/scripts/sysadmin-app/models/admin-login-log.js Outdated

define([

'underscore',

'backbone',

'common',

Copy link

Member

llj Sep 8, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

逗号删了。

llj reviewed Sep 8, 2017

View reviewed changes

static/scripts/sysadmin-app/views/admin-login-logs.js

}

},

addOne: function(login) {

Copy link

Member

llj Sep 8, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

‘login'?

imwhatiam force-pushed the admin-role-log branch from 46e692c to 9598128 Compare September 8, 2017 10:29

llj reviewed Sep 9, 2017

View reviewed changes

seahub/base/middleware.py Outdated

permission_url = {

'can_view_system_info': [

'sys/settings',

Copy link

Member

llj Sep 9, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mark

llj reviewed Sep 9, 2017

View reviewed changes

seahub/base/middleware.py Outdated

'api/v2.1/admin/favicon',

'api/v2.1/admin/license',

'api/v2.1/admin/login-background-image',

],

Copy link

Member

llj Sep 9, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mark.

llj reviewed Sep 9, 2017

View reviewed changes

add admin role/log feature

bc492b9

imwhatiam force-pushed the admin-role-log branch from bb59b8c to bc492b9 Compare September 9, 2017 07:27

[system admin] users: modified table UI

6c04e9e

llj merged commit 45fb407 into master Sep 9, 2017

imwhatiam deleted the admin-role-log branch February 1, 2018 04:27


		class LoginLogs(APIView):

		authentication_classes = (TokenAuthentication, SessionAuthentication )

add admin role/login feature #1784

add admin role/login feature #1784

Conversation

imwhatiam commented Aug 30, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

llj Sep 7, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

llj Sep 9, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

llj Sep 7, 2017 •

edited

Loading

llj Sep 9, 2017 •

edited

Loading