From 8619ab8bca29689656df258fd62a1a4217694f59 Mon Sep 17 00:00:00 2001 From: fit2bot <68588906+fit2bot@users.noreply.github.com> Date: Thu, 21 Jan 2021 12:43:36 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E4=BA=A7=E7=94=9F=E7=9A=84bugs=20(#596)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: 修改创建录像存储的条件为必填 * fix: 修改最后一次执行的log类型为Ansible * fix: 修复批量测试资产可连接性的权限问题 Co-authored-by: Orange --- .../SystemUser/SystemUserDetail/AssetList.vue | 2 +- src/views/ops/TaskDetail/TaskDetail.vue | 2 +- .../sessions/ReplayStorageCreateUpdate.vue | 18 ++++++++++++------ 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/views/assets/SystemUser/SystemUserDetail/AssetList.vue b/src/views/assets/SystemUser/SystemUserDetail/AssetList.vue index e03eed469..67bd55131 100644 --- a/src/views/assets/SystemUser/SystemUserDetail/AssetList.vue +++ b/src/views/assets/SystemUser/SystemUserDetail/AssetList.vue @@ -111,7 +111,7 @@ export default { title: this.$t('assets.TestAssetsConnective'), name: 'TestSelected', can({ selectedRows }) { - return selectedRows.length > 0 && vm.object.auto_push + return selectedRows.length > 0 }, callback: this.bulkTestCallback.bind(this) } diff --git a/src/views/ops/TaskDetail/TaskDetail.vue b/src/views/ops/TaskDetail/TaskDetail.vue index bfb8b0bbd..21ff7693a 100644 --- a/src/views/ops/TaskDetail/TaskDetail.vue +++ b/src/views/ops/TaskDetail/TaskDetail.vue @@ -101,7 +101,7 @@ export default { value: this.object.latest_execution.id, formatter: function(row, value) { const onClick = function() { - window.open(`/#/ops/celery/task/${value}/log/`, '', 'width=900,height=600') + window.open(`/#/ops/task/task/${value}/log/?type=ansible`, '', 'width=900,height=600') } const title = this.$t('common.View') return { title } diff --git a/src/views/sessions/ReplayStorageCreateUpdate.vue b/src/views/sessions/ReplayStorageCreateUpdate.vue index f1b9f1dd0..0913f1926 100644 --- a/src/views/sessions/ReplayStorageCreateUpdate.vue +++ b/src/views/sessions/ReplayStorageCreateUpdate.vue @@ -56,7 +56,8 @@ export default { rules: [Required] }, bucket: { - label: this.$t('sessions.bucket') + label: this.$t('sessions.bucket'), + rules: [Required] }, access_key: { label: 'Access key', @@ -68,10 +69,12 @@ export default { }, endpoint: { label: this.$t('sessions.endPoint'), - helpText: storageTypeMeta.endpointHelpText + helpText: storageTypeMeta.endpointHelpText, + rules: [Required] }, region: { - label: this.$t('sessions.region') + label: this.$t('sessions.region'), + rules: [Required] }, protocol: { label: this.$t('sessions.protocol'), @@ -83,13 +86,16 @@ export default { rules: [Required] }, container_name: { - label: this.$t('sessions.containerName') + label: this.$t('sessions.containerName'), + rules: [Required] }, account_name: { - label: this.$t('sessions.accountName') + label: this.$t('sessions.accountName'), + rules: [Required] }, account_key: { - label: this.$t('sessions.accountKey') + label: this.$t('sessions.accountKey'), + rules: [Required] }, endpoint_suffix: { label: this.$t('sessions.endpointSuffix'), From 44b701edbca9ab023f5611535c2c81f32b493e31 Mon Sep 17 00:00:00 2001 From: Orange Date: Thu, 21 Jan 2021 14:35:41 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=91=BD=E4=BB=A4?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E8=A7=84=E5=88=99=E5=88=9B=E5=BB=BA=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E6=9C=89=E8=AF=A6=E6=83=85=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CommandFilter/CommandFilterDetail/RulesCreateUpdate.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/assets/CommandFilter/CommandFilterDetail/RulesCreateUpdate.vue b/src/views/assets/CommandFilter/CommandFilterDetail/RulesCreateUpdate.vue index c92f1f158..fcf3a84ce 100644 --- a/src/views/assets/CommandFilter/CommandFilterDetail/RulesCreateUpdate.vue +++ b/src/views/assets/CommandFilter/CommandFilterDetail/RulesCreateUpdate.vue @@ -4,6 +4,7 @@ :initial="initial" :fields-meta="fieldsMeta" :url="url" + :has-detail-in-msg="false" :get-next-route="getNextRoute" /> From 1ba790e6802be44e4eb066f38cfb9d6fe35f8677 Mon Sep 17 00:00:00 2001 From: Orange Date: Thu, 21 Jan 2021 14:36:24 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E4=B8=BB=E6=9C=BA=E5=90=8D=E5=AD=97=E6=AE=B5=E5=8F=98=E6=88=90?= =?UTF-8?q?=E4=B8=BB=E6=9C=BA=E5=90=8D=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RequestAssetPerm/RequestAssetPermTicketCreateUpdate.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/views/tickets/RequestAssetPerm/RequestAssetPermTicketCreateUpdate.vue b/src/views/tickets/RequestAssetPerm/RequestAssetPermTicketCreateUpdate.vue index 6d6f76581..a7c8f63e9 100644 --- a/src/views/tickets/RequestAssetPerm/RequestAssetPermTicketCreateUpdate.vue +++ b/src/views/tickets/RequestAssetPerm/RequestAssetPermTicketCreateUpdate.vue @@ -103,7 +103,6 @@ export default { }, methods: { performSubmit(validValues) { - console.log(validValues) const meta = {} const ips = validValues.apply_ip_group if (ips) { @@ -113,7 +112,7 @@ export default { delete validValues['apply_ip_group'] } if (validValues.apply_hostname_group) { - meta.apply_hostname_group = validValues.apply_ip_group + meta.apply_hostname_group = validValues.apply_hostname_group.split(',') delete validValues['apply_hostname_group'] } From 807e3a407ab10d611832780f16930f12ff6771e2 Mon Sep 17 00:00:00 2001 From: Orange Date: Thu, 21 Jan 2021 14:43:43 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=E7=A7=BB=E9=99=A4=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E7=9A=84=E6=9D=83=E9=99=90=E6=8F=90=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/users/User/UserList.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/users/User/UserList.vue b/src/views/users/User/UserList.vue index dfe86aea6..9c7c54d55 100644 --- a/src/views/users/User/UserList.vue +++ b/src/views/users/User/UserList.vue @@ -265,11 +265,11 @@ export default { } this.$message.success(successMsg) } catch (error) { - let errorMsg = this.$t('common.bulkDeleteErrorMsg') - if (!this.currentOrgIsDefault) { - errorMsg = this.$t('common.bulkRemoveErrorMsg') - } - this.$message.error(errorMsg + error) + // let errorMsg = this.$t('common.bulkDeleteErrorMsg') + // if (!this.currentOrgIsDefault) { + // errorMsg = this.$t('common.bulkRemoveErrorMsg') + // } + // this.$message.error(errorMsg + error) } finally { instance.confirmButtonLoading = false } From d267cd1f5eabd5cf32fc0974f7ec1b40a36443d0 Mon Sep 17 00:00:00 2001 From: Orange Date: Thu, 21 Jan 2021 14:57:36 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix:=20=E7=A7=BB=E9=99=A4=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E5=BA=94=E7=94=A8=E7=94=B3=E8=AF=B7=E5=B7=A5=E5=8D=95=E6=97=B6?= =?UTF-8?q?=E5=A4=9A=E4=BD=99=E7=9A=84=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RequestApplicationPermTicketCreateUpdate.vue | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/views/tickets/RequestApplicationPerm/RequestApplicationPermTicketCreateUpdate.vue b/src/views/tickets/RequestApplicationPerm/RequestApplicationPermTicketCreateUpdate.vue index 24ba13f23..1f3f7e49d 100644 --- a/src/views/tickets/RequestApplicationPerm/RequestApplicationPermTicketCreateUpdate.vue +++ b/src/views/tickets/RequestApplicationPerm/RequestApplicationPermTicketCreateUpdate.vue @@ -166,21 +166,19 @@ export default { if (applications) { meta.apply_application_group = applications.split(',') } - if (applications === '') { - delete validValues['apply_application_group'] - } + delete validValues['apply_application_group'] if (systemUser) { meta.apply_system_user_group = systemUser.split(',') } - if (systemUser === '') { - delete validValues['apply_system_user_group'] - } + + delete validValues['apply_system_user_group'] meta.apply_category = validValues.apply_category_type[0] - meta.apply_type = validValues.apply_category_type[1] + delete validValues['apply_category_type'] + meta.apply_date_start = validValues.apply_date_start delete validValues['apply_date_start']