From 4212cb3600a067da8a00ca305c38683a8b532fad Mon Sep 17 00:00:00 2001
From: liuzheng712 <liuzheng712@gmail.com>
Date: Mon, 5 Nov 2018 12:48:32 +0800
Subject: [PATCH 1/2] feat: add tencentcloud-sdk-python==3.0.32

---
 requirements/requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index 399e382f3..6d7ec68f7 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -74,3 +74,4 @@ Werkzeug==0.14.1
 drf-nested-routers==0.90.2
 aliyun-python-sdk-core-v3==2.9.1    
 aliyun-python-sdk-ecs==4.10.1   
+tencentcloud-sdk-python==3.0.32

From fd6e561d4b5187b407dd4fd4e4e17ad641b61646 Mon Sep 17 00:00:00 2001
From: BaiJiangJie <32935519+BaiJiangJie@users.noreply.github.com>
Date: Mon, 12 Nov 2018 16:45:57 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[Bugfix]=20=E8=B5=84=E4=BA=A7/=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=AD=89=E5=8D=87=E5=BA=8F=E6=8E=92=E5=BA=8F=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=8C=E6=98=BE=E7=A4=BA=E5=88=9B=E5=BB=BAoss?=
 =?UTF-8?q?=E5=BD=95=E5=83=8F=E5=AD=98=E5=82=A8bucket=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E6=A1=86=20(#2017)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [Bugfix] 修复资产列表，用户列表排序只有降序的问题

* [update] 系统设置创建oss录像存储, 添加bucket输入框
---
 apps/common/templates/common/replay_storage_create.html | 2 +-
 apps/static/js/jumpserver.js                            | 2 +-
 apps/users/templates/users/user_list.html               | 8 ++++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/apps/common/templates/common/replay_storage_create.html b/apps/common/templates/common/replay_storage_create.html
index 6382d27e1..8b2ab8596 100644
--- a/apps/common/templates/common/replay_storage_create.html
+++ b/apps/common/templates/common/replay_storage_create.html
@@ -213,7 +213,7 @@ $(document).ready(function() {
     field_of_all = [name_id, host_id, port_id, bucket_id, access_key_id, secret_key_id, container_name_id, account_name_id, account_key_id, endpoint_id, endpoint_suffix_id, region_id];
     need_get_field_of_server = [name_id];
     need_get_field_of_s3 = [name_id, bucket_id, access_key_id, secret_key_id, region_id];
-    need_get_field_of_oss = [name_id, access_key_id, secret_key_id, endpoint_id];
+    need_get_field_of_oss = [name_id, bucket_id, access_key_id, secret_key_id, endpoint_id];
     need_get_field_of_azure = [name_id, container_name_id, account_name_id, account_key_id, endpoint_suffix_id];
     need_get_field_of_ceph = [name_id, host_id, port_id, bucket_id, access_key_id, secret_key_id, region_id];
 })
diff --git a/apps/static/js/jumpserver.js b/apps/static/js/jumpserver.js
index 3feedbd54..a54313e97 100644
--- a/apps/static/js/jumpserver.js
+++ b/apps/static/js/jumpserver.js
@@ -508,7 +508,7 @@ jumpserver.initServerSideDataTable = function (options) {
                 if (data.order !== null && data.order.length === 1) {
                     var col = data.order[0].column;
                     var order = options.columns[col].data;
-                    if (data.order[0].dir = "desc") {
+                    if (data.order[0].dir === "desc") {
                         order = "-" + order;
                     }
                     data.order = order;
diff --git a/apps/users/templates/users/user_list.html b/apps/users/templates/users/user_list.html
index 5b4565b8e..f2b1804cc 100644
--- a/apps/users/templates/users/user_list.html
+++ b/apps/users/templates/users/user_list.html
@@ -90,8 +90,12 @@ function initTable() {
              }}],
         ajax_url: '{% url "api-users:user-list" %}',
         columns: [
-            {data: "id"}, {data: "name" }, {data: "username" }, {data: "get_role_display" },
-            {data: "groups_display" }, {data: "get_source_display" }, {data: "is_valid" }, {data: "id" }
+            {data: "id"}, {data: "name" }, {data: "username" },
+            {data: "get_role_display", orderable: false},
+            {data: "groups_display", orderable: false},
+            {data: "get_source_display", orderable: false},
+            {data: "is_valid", orderable: false},
+            {data: "id", orderable: false}
         ],
         op_html: $('#actions').html()
     };