[cloudstack-primate] branch master updated: Disable edit and delete of UI read-only settings (#886)

[rohit]

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 841c085  Disable edit and delete of UI read-only settings (#886)
841c085 is described below

commit 841c085b9edcd7a5484e107289d153acd41d2d81
Author: Pearl Dsilva <pearl1...@gmail.com>
AuthorDate: Fri Dec 4 14:40:32 2020 +0530

    Disable edit and delete of UI read-only settings (#886)
    
    Co-authored-by: Pearl Dsilva <pearl.dsi...@shapeblue.com>
---
 src/components/view/DetailSettings.vue | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/components/view/DetailSettings.vue 
b/src/components/view/DetailSettings.vue
index c5aec61..eaa446c 100644
--- a/src/components/view/DetailSettings.vue
+++ b/src/components/view/DetailSettings.vue
@@ -86,7 +86,10 @@
             <span v-else>{{ item.value }}</span>
           </span>
         </a-list-item-meta>
-        <div slot="actions" v-if="!disableSettings && 'updateTemplate' in 
$store.getters.apis && 'updateVirtualMachine' in $store.getters.apis && 
isAdminOrOwner()">
+        <div
+          slot="actions"
+          v-if="!disableSettings && 'updateTemplate' in $store.getters.apis &&
+            'updateVirtualMachine' in $store.getters.apis && isAdminOrOwner() 
&& allowEditOfDetail(item.name)">
           <a-button shape="circle" size="default" @click="updateDetail(index)" 
v-if="item.edit">
             <a-icon type="check-circle" theme="twoTone" twoToneColor="#52c41a" 
/>
           </a-button>
@@ -99,7 +102,10 @@
             v-if="!item.edit"
             @click="showEditDetail(index)" />
         </div>
-        <div slot="actions" v-if="!disableSettings && 'updateTemplate' in 
$store.getters.apis && 'updateVirtualMachine' in $store.getters.apis && 
isAdminOrOwner()">
+        <div
+          slot="actions"
+          v-if="!disableSettings && 'updateTemplate' in $store.getters.apis &&
+            'updateVirtualMachine' in $store.getters.apis && isAdminOrOwner() 
&& allowEditOfDetail(item.name)">
           <a-popconfirm
             :title="`${$t('label.delete.setting')}?`"
             @confirm="deleteDetail(index)"
@@ -170,6 +176,14 @@ export default {
       })
       this.disableSettings = (this.$route.meta.name === 'vm' && 
this.resource.state !== 'Stopped')
     },
+    allowEditOfDetail (name) {
+      if (this.resource.readonlyuidetails) {
+        if (this.resource.readonlyuidetails.split(',').map(item => 
item.trim()).includes(name)) {
+          return false
+        }
+      }
+      return true
+    },
     showEditDetail (index) {
       this.details[index].edit = true
       this.details[index].originalValue = this.details[index].value