[cloudstack-primate] branch master updated: network: Fixing firewall tags (#533)

[ro...@apache.org]

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 ce316ac  network: Fixing firewall tags (#533)
ce316ac is described below

commit ce316ac6dbb621fd34f3213333d0a73abf730732
Author: davidjumani <dj...@gmail.com>
AuthorDate: Tue Jul 14 10:13:08 2020 +0530

    network: Fixing firewall tags (#533)
---
 src/views/network/FirewallRules.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/network/FirewallRules.vue b/src/views/network/FirewallRules.vue
index 887ca46..510e164 100644
--- a/src/views/network/FirewallRules.vue
+++ b/src/views/network/FirewallRules.vue
@@ -107,17 +107,17 @@
           <p class="add-tags__label">{{ $t('label.value') }}</p>
           <a-input v-model="newTag.value"></a-input>
         </div>
-        <a-button type="primary" :disabled="!('createTag' in $store.getters.apis)" @click="() => handleAddTag()" :loading="addTagLoading">{{ $t('label.add') }}</a-button>
+        <a-button type="primary" :disabled="!('createTags' in $store.getters.apis)" @click="() => handleAddTag()" :loading="addTagLoading">{{ $t('label.add') }}</a-button>
       </div>
 
       <a-divider></a-divider>
 
       <div class="tags-container">
-        <div class="tags" v-for="(tag, index) in tags" :key="index">
-          <a-tag :key="index" :closable="'deleteTag' in $store.getters.apis" :afterClose="() => handleDeleteTag(tag)">
+        <template class="tags" v-for="(tag) in tags">
+          <a-tag :key="tag.key" :closable="'deleteTags' in $store.getters.apis" :afterClose="() => handleDeleteTag(tag)">
             {{ tag.key }} = {{ tag.value }}
           </a-tag>
-        </div>
+        </template>
       </div>
 
       <a-button class="add-tags-done" @click="tagsModalVisible = false" type="primary">{{ $t('label.done') }}</a-button>
@@ -296,7 +296,7 @@ export default {
         resourceType: 'FirewallRule',
         listAll: true
       }).then(response => {
-        this.tags = response.listtagsresponse.tag
+        this.tags = response.listtagsresponse.tag || []
       }).catch(error => {
         this.$notifyError(error)
         this.closeModal()