diff --git a/src/components/Cards/RelationCard/index.vue b/src/components/Cards/RelationCard/index.vue index aba2b68f3..c740df618 100644 --- a/src/components/Cards/RelationCard/index.vue +++ b/src/components/Cards/RelationCard/index.vue @@ -279,6 +279,7 @@ export default { return } this.select2.disabledValues = this.hasObjectsId + if (this.getHasObjects) { this.getHasObjects(this.hasObjectsId).then((data) => { this.iHasObjects = data diff --git a/src/components/Table/TableFormatters/LabelsFormatter.vue b/src/components/Table/TableFormatters/LabelsFormatter.vue index 81590352e..816d6f597 100644 --- a/src/components/Table/TableFormatters/LabelsFormatter.vue +++ b/src/components/Table/TableFormatters/LabelsFormatter.vue @@ -194,6 +194,7 @@ export default { }) }, goToLabelList() { + this.showDialog = false this.$router.push({ name: 'LabelList' }) } } diff --git a/src/router/console/acls.js b/src/router/console/acls.js index bd82599d6..296ea988f 100644 --- a/src/router/console/acls.js +++ b/src/router/console/acls.js @@ -102,7 +102,10 @@ export default [ name: 'CommandFilterAclDetail', component: () => import('@/views/acl/CommandAcl/CommandFilterAcl/CommandFilterAclDetail/index'), hidden: true, - meta: { title: i18n.t('CommandFilterAclDetail'), activeMenu: '' } + meta: { + title: i18n.t('CommandFilterAclDetail'), + activeMenu: '' + } }, { path: ':id/update', diff --git a/src/views/acl/CommandAcl/CommandFilterAcl/CommandFilterAclList.vue b/src/views/acl/CommandAcl/CommandFilterAcl/CommandFilterAclList.vue index 673c2c363..5064d4e1b 100644 --- a/src/views/acl/CommandAcl/CommandFilterAcl/CommandFilterAclList.vue +++ b/src/views/acl/CommandAcl/CommandFilterAcl/CommandFilterAclList.vue @@ -2,7 +2,6 @@
- - - diff --git a/src/views/tickets/TicketFlow/FlowRuleField.vue b/src/views/tickets/TicketFlow/FlowRuleField.vue index 3e5fbd42c..d115a0a71 100644 --- a/src/views/tickets/TicketFlow/FlowRuleField.vue +++ b/src/views/tickets/TicketFlow/FlowRuleField.vue @@ -12,7 +12,6 @@ {{ vm.$t('SuperOrgAdmin') }} {{ vm.$t('CustomUser') }} -
@@ -86,7 +85,7 @@ export default { } -