From b56d73ba9ee110a921758513d7672f3ea6f22f58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=81=E5=B9=BF?= <ibuler@qq.com>
Date: Mon, 17 Dec 2018 20:09:25 +0800
Subject: [PATCH] Node asset amount (#2192)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [Bugfix] 修复错误

* [Update] 优化用户api
---
 .../templates/assets/_asset_list_modal.html   |  30 +++------
 apps/locale/zh/LC_MESSAGES/django.mo          | Bin 59786 -> 59907 bytes
 apps/locale/zh/LC_MESSAGES/django.po          |  60 +++++++++++-------
 apps/users/api/group.py                       |   4 +-
 apps/users/models/user.py                     |  12 ++++
 apps/users/serializers/v1.py                  |  29 +++------
 apps/users/templates/users/user_list.html     |  24 +++++--
 7 files changed, 84 insertions(+), 75 deletions(-)

diff --git a/apps/assets/templates/assets/_asset_list_modal.html b/apps/assets/templates/assets/_asset_list_modal.html
index fe50ac2b3..9c3cf0b1d 100644
--- a/apps/assets/templates/assets/_asset_list_modal.html
+++ b/apps/assets/templates/assets/_asset_list_modal.html
@@ -71,14 +71,14 @@ function initTable2() {
 
 function onSelected2(event, treeNode) {
     var url = asset_table2.ajax.url();
-    url = setUrlParam(url, "node_id", treeNode.node_id);
-    setCookie('node_selected', treeNode.id);
+    url = setUrlParam(url, "node_id", treeNode.meta.node.id);
     asset_table2.ajax.url(url);
     asset_table2.ajax.reload();
 }
 
 
 function initTree2() {
+    var url = '{% url 'api-assets:node-children-tree' %}?assets=0';
     var setting = {
         view: {
             dblClickExpand: false,
@@ -89,29 +89,17 @@ function initTree2() {
                 enable: true
             }
         },
+        async: {
+			enable: true,
+			url: url,
+			autoParam: ["id=key", "name=n", "level=lv"],
+            type: 'get'
+		},
         callback: {
             onSelected: onSelected2
         }
     };
-
-    var zNodes = [];
-    $.get("{% url 'api-assets:node-list' %}", function(data, status){
-        $.each(data, function (index, value) {
-            value["node_id"] = value["id"];
-            value["id"] = value["tree_id"];
-            value["pId"] = value["tree_parent"];
-            {#value["open"] = true;#}
-            if (value["key"] === "0") {
-                value["open"] = true;
-            }
-            value["name"] = value["value"] + ' (' + value['assets_amount'] + ')';
-        });
-        zNodes = data;
-        $.fn.zTree.init($("#assetTree2"), setting, zNodes);
-        zTree2 = $.fn.zTree.getZTreeObj("assetTree2");
-        var root = zTree2.getNodes()[0];
-        zTree2.expandNode(root);
-    });
+    zTree2 = $.fn.zTree.init($("#assetTree2"), setting);
 }
 
 
diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo
index a740d8a47f141f91ac011e1c77c31c8805242c43..bbbee180bb402790b79c2a3e0ad2573935d7d393 100644
GIT binary patch
delta 17868
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

delta 17746
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
JySX#u{{cZHoQnVe

diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po
index dfce43982..7f42c17be 100644
--- a/apps/locale/zh/LC_MESSAGES/django.po
+++ b/apps/locale/zh/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jumpserver 0.3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-17 17:51+0800\n"
+"POT-Creation-Date: 2018-12-17 20:06+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: ibuler <ibuler@qq.com>\n"
 "Language-Team: Jumpserver team<ibuler@qq.com>\n"
@@ -480,7 +480,7 @@ msgid "Default"
 msgstr "默认"
 
 #: assets/models/cluster.py:36 assets/models/label.py:14
-#: users/models/user.py:420
+#: users/models/user.py:432
 msgid "System"
 msgstr "系统"
 
@@ -617,7 +617,7 @@ msgstr "默认资产组"
 #: terminal/templates/terminal/command_list.html:72
 #: terminal/templates/terminal/session_list.html:33
 #: terminal/templates/terminal/session_list.html:71 users/forms.py:314
-#: users/models/user.py:33 users/models/user.py:408
+#: users/models/user.py:33 users/models/user.py:420
 #: users/templates/users/user_group_detail.html:78
 #: users/templates/users/user_group_list.html:13 users/views/user.py:386
 #: xpack/plugins/orgs/forms.py:26
@@ -1021,7 +1021,7 @@ msgstr "测试"
 #: users/templates/users/user_detail.html:25
 #: users/templates/users/user_group_detail.html:28
 #: users/templates/users/user_group_list.html:43
-#: users/templates/users/user_list.html:77
+#: users/templates/users/user_list.html:80
 #: users/templates/users/user_profile.html:155
 #: users/templates/users/user_profile.html:185
 #: users/templates/users/user_profile.html:194
@@ -1055,8 +1055,8 @@ msgstr "更新"
 #: users/templates/users/user_detail.html:30
 #: users/templates/users/user_group_detail.html:32
 #: users/templates/users/user_group_list.html:45
-#: users/templates/users/user_list.html:81
-#: users/templates/users/user_list.html:85
+#: users/templates/users/user_list.html:84
+#: users/templates/users/user_list.html:88
 #: xpack/plugins/cloud/templates/cloud/account_detail.html:29
 #: xpack/plugins/cloud/templates/cloud/account_list.html:40
 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:32
@@ -1090,7 +1090,7 @@ msgstr "选择节点"
 #: users/templates/users/user_detail.html:480
 #: users/templates/users/user_group_create_update.html:32
 #: users/templates/users/user_group_list.html:88
-#: users/templates/users/user_list.html:205
+#: users/templates/users/user_list.html:208
 #: users/templates/users/user_profile.html:236
 #: xpack/plugins/cloud/templates/cloud/account_create_update.html:34
 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_create.html:36
@@ -1175,7 +1175,6 @@ msgstr "快速修改"
 #: users/templates/users/user_detail.html:144
 #: users/templates/users/user_granted_asset.html:46
 #: users/templates/users/user_group_granted_asset.html:46
-#: users/templates/users/user_list.html:28
 #: users/templates/users/user_profile.html:63
 msgid "Active"
 msgstr "激活中"
@@ -1308,7 +1307,7 @@ msgstr "重命名失败，不能更改root节点的名称"
 #: users/templates/users/user_detail.html:406
 #: users/templates/users/user_detail.html:474
 #: users/templates/users/user_group_list.html:82
-#: users/templates/users/user_list.html:199
+#: users/templates/users/user_list.html:202
 msgid "Are you sure?"
 msgstr "你确认吗?"
 
@@ -1324,7 +1323,7 @@ msgstr "删除选择资产"
 #: users/templates/users/user_detail.html:478
 #: users/templates/users/user_group_create_update.html:31
 #: users/templates/users/user_group_list.html:86
-#: users/templates/users/user_list.html:203
+#: users/templates/users/user_list.html:206
 #: xpack/plugins/orgs/templates/orgs/org_create_update.html:32
 msgid "Cancel"
 msgstr "取消"
@@ -3330,7 +3329,7 @@ msgstr "添加到用户组"
 msgid "Public key should not be the same as your old one."
 msgstr "不能和原来的密钥相同"
 
-#: users/forms.py:114 users/forms.py:249 users/serializers/v1.py:51
+#: users/forms.py:114 users/forms.py:249 users/serializers/v1.py:38
 msgid "Not a valid ssh public key"
 msgstr "ssh密钥不合法"
 
@@ -3457,7 +3456,7 @@ msgstr "Agent"
 msgid "Date login"
 msgstr "登录日期"
 
-#: users/models/user.py:32 users/models/user.py:416
+#: users/models/user.py:32 users/models/user.py:428
 msgid "Administrator"
 msgstr "管理员"
 
@@ -3503,7 +3502,7 @@ msgstr "用户来源"
 msgid "Date password last updated"
 msgstr "最后更新密码日期"
 
-#: users/models/user.py:419
+#: users/models/user.py:431
 msgid "Administrator is the super user of system"
 msgstr "Administrator是初始的超级管理员"
 
@@ -3924,23 +3923,37 @@ msgstr "用户组删除"
 msgid "UserGroup Deleting failed."
 msgstr "用户组删除失败"
 
-#: users/templates/users/user_list.html:200
+#: users/templates/users/user_list.html:28 xpack/plugins/cloud/models.py:52
+#: xpack/plugins/cloud/templates/cloud/account_detail.html:60
+#: xpack/plugins/cloud/templates/cloud/account_list.html:14
+msgid "Validity"
+msgstr "账户状态"
+
+#: users/templates/users/user_list.html:203
 msgid "This will delete the selected users !!!"
 msgstr "删除选中用户 !!!"
 
-#: users/templates/users/user_list.html:209
+#: users/templates/users/user_list.html:212
 msgid "User Deleted."
 msgstr "已被删除"
 
-#: users/templates/users/user_list.html:210
-#: users/templates/users/user_list.html:215
+#: users/templates/users/user_list.html:213
+#: users/templates/users/user_list.html:218
 msgid "User Delete"
 msgstr "删除"
 
-#: users/templates/users/user_list.html:214
+#: users/templates/users/user_list.html:217
 msgid "User Deleting failed."
 msgstr "用户删除失败"
 
+#: users/templates/users/user_list.html:253
+msgid "User is expired"
+msgstr "用户已失效"
+
+#: users/templates/users/user_list.html:256
+msgid "User is inactive"
+msgstr "用户已禁用"
+
 #: users/templates/users/user_otp_authentication.html:6
 #: users/templates/users/user_password_authentication.html:6
 msgid "Authenticate"
@@ -4407,12 +4420,6 @@ msgstr ""
 msgid "Access key secret"
 msgstr ""
 
-#: xpack/plugins/cloud/models.py:52
-#: xpack/plugins/cloud/templates/cloud/account_detail.html:60
-#: xpack/plugins/cloud/templates/cloud/account_list.html:14
-msgid "Validity"
-msgstr "账户状态"
-
 #: xpack/plugins/cloud/models.py:120
 msgid "Regions"
 msgstr "地域"
@@ -4606,6 +4613,11 @@ msgstr "创建组织"
 msgid "Update org"
 msgstr "更新组织"
 
+#, fuzzy
+#~| msgid "Validity"
+#~ msgid "Valid"
+#~ msgstr "账户状态"
+
 #~ msgid "You can't update the root node name"
 #~ msgstr "不能修改根节点名称"
 
diff --git a/apps/users/api/group.py b/apps/users/api/group.py
index 2b738722c..8cf9fcb0e 100644
--- a/apps/users/api/group.py
+++ b/apps/users/api/group.py
@@ -6,7 +6,7 @@ from rest_framework_bulk import BulkModelViewSet
 from rest_framework.pagination import LimitOffsetPagination
 
 from ..serializers import UserGroupSerializer, \
-    UserGroupUpdateMemeberSerializer
+    UserGroupUpdateMemberSerializer
 from ..models import UserGroup
 from common.permissions import IsOrgAdmin
 from common.mixins import IDInFilterMixin
@@ -26,5 +26,5 @@ class UserGroupViewSet(IDInFilterMixin, BulkModelViewSet):
 
 class UserGroupUpdateUserApi(generics.RetrieveUpdateAPIView):
     queryset = UserGroup.objects.all()
-    serializer_class = UserGroupUpdateMemeberSerializer
+    serializer_class = UserGroupUpdateMemberSerializer
     permission_classes = (IsOrgAdmin,)
diff --git a/apps/users/models/user.py b/apps/users/models/user.py
index 3a86eab9c..9cdbc9f77 100644
--- a/apps/users/models/user.py
+++ b/apps/users/models/user.py
@@ -142,6 +142,18 @@ class User(AbstractUser):
             return True
         return False
 
+    @property
+    def groups_display(self):
+        return ' '.join(self.groups.all().values_list('name', flat=True))
+
+    @property
+    def role_display(self):
+        return self.get_role_display()
+
+    @property
+    def source_display(self):
+        return self.get_source_display()
+
     @property
     def is_expired(self):
         if self.date_expired and self.date_expired < timezone.now():
diff --git a/apps/users/serializers/v1.py b/apps/users/serializers/v1.py
index cf0e75d1f..270ab239f 100644
--- a/apps/users/serializers/v1.py
+++ b/apps/users/serializers/v1.py
@@ -13,31 +13,18 @@ signer = get_signer()
 
 
 class UserSerializer(BulkSerializerMixin, serializers.ModelSerializer):
-    groups_display = serializers.SerializerMethodField()
-    groups = serializers.PrimaryKeyRelatedField(
-        many=True, queryset=UserGroup.objects.all(), required=False
-    )
 
     class Meta:
         model = User
         list_serializer_class = BulkListSerializer
-        exclude = [
-            'first_name', 'last_name', 'password', '_private_key',
-            '_public_key', '_otp_secret_key', 'user_permissions'
+        fields = [
+            'id', 'name', 'username', 'email', 'groups', 'groups_display',
+            'role', 'role_display', 'avatar_url', 'wechat', 'phone',
+            'otp_level', 'comment', 'source', 'source_display',
+            'is_valid', 'is_expired', 'is_active',
+            'created_by', 'is_first_login',
+            'date_password_last_updated', 'date_expired',
         ]
-        # validators = []
-
-    def get_field_names(self, declared_fields, info):
-        fields = super(UserSerializer, self).get_field_names(declared_fields, info)
-        fields.extend([
-            'groups_display', 'get_role_display',
-            'get_source_display', 'is_valid'
-        ])
-        return fields
-
-    @staticmethod
-    def get_groups_display(obj):
-        return " ".join([group.name for group in obj.groups.all()])
 
 
 class UserPKUpdateSerializer(serializers.ModelSerializer):
@@ -74,7 +61,7 @@ class UserGroupSerializer(BulkSerializerMixin, serializers.ModelSerializer):
         return [user.name for user in obj.users.all()]
 
 
-class UserGroupUpdateMemeberSerializer(serializers.ModelSerializer):
+class UserGroupUpdateMemberSerializer(serializers.ModelSerializer):
     users = serializers.PrimaryKeyRelatedField(many=True, queryset=User.objects.all())
 
     class Meta:
diff --git a/apps/users/templates/users/user_list.html b/apps/users/templates/users/user_list.html
index f2b1804cc..2ebfa6664 100644
--- a/apps/users/templates/users/user_list.html
+++ b/apps/users/templates/users/user_list.html
@@ -25,7 +25,7 @@
             <th class="text-center">{% trans 'Role' %}</th>
             <th class="text-center">{% trans 'User group' %}</th>
             <th class="text-center">{% trans 'Source' %}</th>
-            <th class="text-center">{% trans 'Active' %}</th>
+            <th class="text-center">{% trans 'Validity' %}</th>
             <th class="text-center">{% trans 'Action' %}</th>
         </tr>
     </thead>
@@ -66,11 +66,14 @@ function initTable() {
                 var innerHtml = cellData.length > 20 ? cellData.substring(0, 20) + '...': cellData;
                 $(td).html('<span href="javascript:void(0);" data-toggle="tooltip" title="' + cellData + '">' + innerHtml + '</span>');
              }},
-            {targets: 6, createdCell: function (td, cellData) {
-                if (!cellData) {
-                    $(td).html('<i class="fa fa-times text-danger"></i>')
-                } else {
+            {targets: 6, createdCell: function (td, cellData, rowData) {
+                if (cellData) {
                     $(td).html('<i class="fa fa-check text-navy"></i>')
+                } else if (!rowData.is_active) {
+
+                    $(td).html('<i class="fa fa-times text-danger inactive"></i>')
+                } else if (rowData.is_expired) {
+                    $(td).html('<i class="fa fa-times text-danger expired"></i>')
                 }
              }},
             {targets: 7, createdCell: function (td, cellData, rowData) {
@@ -91,9 +94,9 @@ function initTable() {
         ajax_url: '{% url "api-users:user-list" %}',
         columns: [
             {data: "id"}, {data: "name" }, {data: "username" },
-            {data: "get_role_display", orderable: false},
+            {data: "role_display", orderable: false},
             {data: "groups_display", orderable: false},
-            {data: "get_source_display", orderable: false},
+            {data: "source_display", orderable: false},
             {data: "is_valid", orderable: false},
             {data: "id", orderable: false}
         ],
@@ -246,6 +249,13 @@ $(document).ready(function(){
     var uid = $this.data('uid');
     var the_url = '{% url "api-users:user-detail" pk=DEFAULT_PK %}'.replace("{{ DEFAULT_PK }}", uid);
     objectDelete($this, name, the_url);
+}).on('click', '.expired', function () {
+    var msg = '{% trans "User is expired" %}';
+    toastr.error(msg)
+}).on('click', '.inactive', function () {
+    var msg = '{% trans 'User is inactive' %}';
+    toastr.error(msg)
+
 })
 </script>
 {% endblock %}