This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack-primate.git
The following commit(s) were added to refs/heads/master by this push: new 75469a9 image: Allows viewing delete/copy iso/template buttons for non ready resources and enables settings (#517) 75469a9 is described below commit 75469a922f4da54f8c59a2aeecd2dbf25662d550 Author: Pearl Dsilva <pearl1...@gmail.com> AuthorDate: Wed Jul 8 13:01:23 2020 +0530 image: Allows viewing delete/copy iso/template buttons for non ready resources and enables settings (#517) Fixes #511 --- src/components/view/DetailSettings.vue | 3 ++- src/views/image/IsoZones.vue | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/view/DetailSettings.vue b/src/components/view/DetailSettings.vue index 1e9fc8c..641f25f 100644 --- a/src/components/view/DetailSettings.vue +++ b/src/components/view/DetailSettings.vue @@ -173,7 +173,8 @@ export default { }, isAdminOrOwner () { return ['Admin'].includes(this.$store.getters.userInfo.roletype) || - (this.resource.domainid === this.$store.getters.userInfo.domainid && this.resource.account === this.$store.getters.userInfo.account) + (this.resource.domainid === this.$store.getters.userInfo.domainid && this.resource.account === this.$store.getters.userInfo.account) || + this.resource.project && this.resource.projectid === this.$store.getters.project.id }, runApi () { var apiName = '' diff --git a/src/views/image/IsoZones.vue b/src/views/image/IsoZones.vue index f76c034..3dcd960 100644 --- a/src/views/image/IsoZones.vue +++ b/src/views/image/IsoZones.vue @@ -228,8 +228,7 @@ export default { isActionPermitted () { return (['Admin'].includes(this.$store.getters.userInfo.roletype) || (this.resource.domainid === this.$store.getters.userInfo.domainid && this.resource.account === this.$store.getters.userInfo.account)) && - !(this.resource.account !== 'SYSTEM' && this.resource.domainid === 1) && - this.resource.isready + !(this.resource.account !== 'SYSTEM' && this.resource.domainid === 1) }, deleteIso (record) { const params = {