Merge pull request #2028 from jumpserver/dev

Dev

README.md

@@ -20,7 +20,7 @@ Jumpserver采纳分布式架构，支持多机房跨区域部署，中心节点
 
 ### 功能
 
- ![Jumpserver功能](https://jumpserver-release.oss-cn-hangzhou.aliyuncs.com/Jumpserver13.jpg "Jumpserver功能")
+ ![Jumpserver功能](https://jumpserver-release.oss-cn-hangzhou.aliyuncs.com/Jumpserver-14.png "Jumpserver功能")
 
 ### 开始使用
 

apps/assets/api/domain.py

@@ -39,7 +39,7 @@ class DomainViewSet(BulkModelViewSet):
 
 
 class GatewayViewSet(BulkModelViewSet):
-    filter_fields = ("domain__name", "name", "username", "ip")
+    filter_fields = ("domain__name", "name", "username", "ip", "domain")
     search_fields = filter_fields
     queryset = Gateway.objects.all()
     permission_classes = (IsOrgAdmin,)

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];
 })

apps/common/utils.py

@@ -38,7 +38,8 @@ def reverse(view_name, urlconf=None, args=None, kwargs=None,
 
     if external:
         from common.models import common_settings
-        url = common_settings.SITE_URL.strip('/') + url
+        site_url = common_settings.SITE_URL or settings.SITE_URL
+        url = site_url.strip('/') + url
     return url
 
 

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;

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: "id"}, {data: "name" }, {data: "username" },
-            {data: "groups_display" }, {data: "get_source_display" }, {data: "is_valid" }, {data: "id" }
+            {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()
     };

jms

@@ -178,7 +178,7 @@ def start_celery():
         '-A',  'ops',
         '-l', LOG_LEVEL.lower(),
         '--pidfile', pid_file,
-        '-c', str(WORKERS),
+        '--autoscale', '20,4',
     ]
     if DAEMON:
         cmd.extend([