From 4cdddaa4930e9262745c0a443fdba92dfd9c5b03 Mon Sep 17 00:00:00 2001 From: ibuler Date: Mon, 12 Nov 2018 16:43:35 +0800 Subject: [PATCH 1/5] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8D=E7=BD=91?= =?UTF-8?q?=E5=9F=9F=E7=BD=91=E5=85=B3=E5=88=97=E8=A1=A8=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/api/domain.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/assets/api/domain.py b/apps/assets/api/domain.py index 2e24829dc..721c149b7 100644 --- a/apps/assets/api/domain.py +++ b/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,) 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/5] =?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() }; From f7daf26a034c79e5ffbb4e419f5329e0e0e6f82f Mon Sep 17 00:00:00 2001 From: ibuler Date: Mon, 12 Nov 2018 17:47:41 +0800 Subject: [PATCH 3/5] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9celery?= =?UTF-8?q?=E8=BF=90=E8=A1=8C=EF=BC=8C=E6=9C=80=E5=A4=A720=E4=B8=AA?= =?UTF-8?q?=E8=BF=9B=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jms | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jms b/jms index 9cbf020e8..e1d12b7be 100755 --- a/jms +++ b/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([ From 28b6144189715d7c9ff3abbc3f8cfe1ef727a782 Mon Sep 17 00:00:00 2001 From: BaiJiangJie <32935519+BaiJiangJie@users.noreply.github.com> Date: Tue, 13 Nov 2018 14:59:29 +0800 Subject: [PATCH 4/5] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8D=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E7=94=A8=E6=88=B7common=5Fsettings.SITE=5FURL=20?= =?UTF-8?q?=E4=B8=BANone=E7=9A=84bug=20(#2027)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/common/utils.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/common/utils.py b/apps/common/utils.py index 7daa449a4..bb4f0132c 100644 --- a/apps/common/utils.py +++ b/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 From 52647da79b01886123c736dadec0635e47863a88 Mon Sep 17 00:00:00 2001 From: BaiJiangJie <32935519+BaiJiangJie@users.noreply.github.com> Date: Tue, 13 Nov 2018 14:59:50 +0800 Subject: [PATCH 5/5] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9jumpserver?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=9B=BE=E7=89=87=20(#2020)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ec3be7810..3a220c96f 100644 --- a/README.md +++ b/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功能") ### 开始使用