From 7993ab076a1ade7884a162bb6ade602e19715f70 Mon Sep 17 00:00:00 2001 From: martinRenou Date: Wed, 24 May 2017 15:01:48 +0100 Subject: [PATCH 1/2] Replace show attribute to visible in admin part --- .../admin/vue-components/AccountingView.vue | 20 +++++++++---------- .../admin/vue-components/ApplicationsView.vue | 20 +++++++++---------- .../admin/vue-components/ContainersView.vue | 8 ++++---- frontend/admin/vue-components/UsersView.vue | 20 +++++++++---------- .../accounting/NewAccountingDialog.vue | 4 ++-- .../applications/NewApplicationDialog.vue | 4 ++-- 6 files changed, 38 insertions(+), 38 deletions(-) diff --git a/frontend/admin/vue-components/AccountingView.vue b/frontend/admin/vue-components/AccountingView.vue index 3a74f1069..4f059cfaa 100644 --- a/frontend/admin/vue-components/AccountingView.vue +++ b/frontend/admin/vue-components/AccountingView.vue @@ -13,15 +13,15 @@ + @closed="newAccountingDialog.visible = false"> @@ -51,7 +51,7 @@ rows: [], globalActions: [{ label: "Create New Entry", - callback: () => { this.newAccountingDialog.show = true; } + callback: () => { this.newAccountingDialog.visible = true; } }], rowActions: [{ label: "Remove", @@ -60,12 +60,12 @@ }, newAccountingDialog: { - show: false, + visible: false, userId: this.$route.params.id }, removeAccountingDialog: { - show: false, + visible: false, accountingToRemove: null }, @@ -101,17 +101,17 @@ }, newAccountingCreated: function() { - this.newAccountingDialog.show = false; + this.newAccountingDialog.visible = false; this.updateTable(); }, removeAction: function(row) { this.removeAccountingDialog.accountingToRemove = row[0]; - this.removeAccountingDialog.show = true; + this.removeAccountingDialog.visible = true; }, closeRemoveAccountingDialog: function() { - this.removeAccountingDialog.show = false; + this.removeAccountingDialog.visible = false; this.removeAccountingDialog.accountingToRemove = null; }, diff --git a/frontend/admin/vue-components/ApplicationsView.vue b/frontend/admin/vue-components/ApplicationsView.vue index 088c46203..860964545 100644 --- a/frontend/admin/vue-components/ApplicationsView.vue +++ b/frontend/admin/vue-components/ApplicationsView.vue @@ -12,13 +12,13 @@ @@ -46,7 +46,7 @@ rows: [], globalActions: [{ label: "Create New Entry", - callback: () => { this.newApplicationDialog.show = true; } + callback: () => { this.newApplicationDialog.visible = true; } }], rowActions: [{ label: "Remove", @@ -55,11 +55,11 @@ }, newApplicationDialog: { - show: false + visible: false }, removeApplicationDialog: { - show: false, + visible: false, applicationToRemove: { id: null, name: "" @@ -94,12 +94,12 @@ }, newApplicationCreated: function() { - this.newApplicationDialog.show = false; + this.newApplicationDialog.visible = false; this.updateTable(); }, newApplicationDialogClosed: function() { - this.newApplicationDialog.show = false; + this.newApplicationDialog.visible = false; }, removeAction: function(row) { @@ -107,7 +107,7 @@ id: row[0], name: row[1] }; - this.removeApplicationDialog.show = true; + this.removeApplicationDialog.visible = true; }, removeApplication: function () { @@ -122,7 +122,7 @@ }); }, closeRemoveApplicationDialog: function() { - this.removeApplicationDialog.show = false; + this.removeApplicationDialog.visible = false; this.removeApplicationDialog.applicationToRemove = { name: "", id: null diff --git a/frontend/admin/vue-components/ContainersView.vue b/frontend/admin/vue-components/ContainersView.vue index 40bff6f28..1fd93ed8b 100644 --- a/frontend/admin/vue-components/ContainersView.vue +++ b/frontend/admin/vue-components/ContainersView.vue @@ -10,7 +10,7 @@ :rowActions="table.rowActions"> @@ -34,7 +34,7 @@ }] }, stopContainerDialog: { - show: false, + visible: false, containerToStop: null }, communicationError: null @@ -69,7 +69,7 @@ stopAction: function(row) { this.stopContainerDialog.containerToStop = row[0]; - this.stopContainerDialog.show = true; + this.stopContainerDialog.visible = true; }, stopContainer: function () { @@ -85,7 +85,7 @@ }, closeStopContainerDialog: function() { - this.stopContainerDialog.show = false; + this.stopContainerDialog.visible = false; this.stopContainerDialog.containerToStop = null; } } diff --git a/frontend/admin/vue-components/UsersView.vue b/frontend/admin/vue-components/UsersView.vue index c115973f0..f77315866 100644 --- a/frontend/admin/vue-components/UsersView.vue +++ b/frontend/admin/vue-components/UsersView.vue @@ -10,12 +10,12 @@ :rowActions="table.rowActions"> + @closed="newUserDialog.visible = false;">
Do you want to remove User {{removeUserDialog.userToRemove.name}} @@ -40,7 +40,7 @@ rows: [], globalActions: [{ label: "Create New Entry", - callback: () => { this.newUserDialog.show = true; } + callback: () => { this.newUserDialog.visible = true; } }], rowActions: [{ label: "Policies", @@ -53,10 +53,10 @@ }, users: [], newUserDialog: { - show: false + visible: false }, removeUserDialog: { - show: false, + visible: false, userToRemove: { id: null, name: "" @@ -90,7 +90,7 @@ }, newUserCreated: function() { - this.newUserDialog.show = false; + this.newUserDialog.visible = false; this.updateTable(); }, @@ -104,11 +104,11 @@ removeAction: function(row) { this.removeUserDialog.userToRemove.id = row[0]; this.removeUserDialog.userToRemove.name = row[1]; - this.removeUserDialog.show = true; + this.removeUserDialog.visible = true; }, closeRemoveUserDialog: function() { - this.removeUserDialog.show = false; + this.removeUserDialog.visible = false; this.removeUserDialog.userToRemove = { id: null, name: "" diff --git a/frontend/admin/vue-components/accounting/NewAccountingDialog.vue b/frontend/admin/vue-components/accounting/NewAccountingDialog.vue index ce32d685f..3b9845e3c 100644 --- a/frontend/admin/vue-components/accounting/NewAccountingDialog.vue +++ b/frontend/admin/vue-components/accounting/NewAccountingDialog.vue @@ -60,7 +60,7 @@ let resources = require("admin-resources"); module.exports = { - props: ['show', "userId"], + props: ['visible', "userId"], data: function () { return { @@ -135,7 +135,7 @@ }, watch: { - "show": function (value) { + "visible": function (value) { if (value) { this.reset(); } diff --git a/frontend/admin/vue-components/applications/NewApplicationDialog.vue b/frontend/admin/vue-components/applications/NewApplicationDialog.vue index c13f37b1d..1e696f1e2 100644 --- a/frontend/admin/vue-components/applications/NewApplicationDialog.vue +++ b/frontend/admin/vue-components/applications/NewApplicationDialog.vue @@ -26,7 +26,7 @@ let resources = require("admin-resources"); module.exports = { - props: ['show'], + props: ['visible'], data: function () { return { @@ -73,7 +73,7 @@ }, watch: { - "show": function (value) { + "visible": function (value) { if (value) { this.reset(); } From cd20a491e6e35c8b384b40f398c5feebbcc36eee Mon Sep 17 00:00:00 2001 From: martinRenou Date: Wed, 24 May 2017 15:06:34 +0100 Subject: [PATCH 2/2] Change remaining flags --- frontend/admin/vue-components/AccountingView.vue | 2 +- frontend/admin/vue-components/ApplicationsView.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/admin/vue-components/AccountingView.vue b/frontend/admin/vue-components/AccountingView.vue index 4f059cfaa..1d40a2661 100644 --- a/frontend/admin/vue-components/AccountingView.vue +++ b/frontend/admin/vue-components/AccountingView.vue @@ -14,7 +14,7 @@ diff --git a/frontend/admin/vue-components/ApplicationsView.vue b/frontend/admin/vue-components/ApplicationsView.vue index 860964545..d7682fa7c 100644 --- a/frontend/admin/vue-components/ApplicationsView.vue +++ b/frontend/admin/vue-components/ApplicationsView.vue @@ -13,7 +13,7 @@