Issue krayin#534 fixed

jitendra-webkul · Oct 21, 2021 · e8c0ec5 · e8c0ec5
1 parent b202e1b
commit e8c0ec5
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 5 deletions.
diff --git a/packages/Webkul/Admin/src/Config/acl.php b/packages/Webkul/Admin/src/Config/acl.php
@@ -369,12 +369,17 @@
     ], [
         'key'   => 'settings.other_settings.tags.create',
         'name'  => 'admin::app.acl.create',
-        'route' => ['admin.settings.tags.create', 'admin.settings.tags.store'],
+        'route' => ['admin.settings.tags.create', 'admin.settings.tags.store', 'admin.leads.tags.store'],
+        'sort'  => 1,
+    ], [
+        'key'   => 'settings.other_settings.tags.edit',
+        'name'  => 'admin::app.acl.edit',
+        'route' => ['admin.settings.tags.edit', 'admin.settings.tags.update'],
         'sort'  => 1,
     ], [
         'key'   => 'settings.other_settings.tags.delete',
         'name'  => 'admin::app.acl.delete',
-        'route' => ['admin.settings.tags.delete', 'admin.settings.tags.mass_delete'],
+        'route' => ['admin.settings.tags.delete', 'admin.settings.tags.mass_delete', 'admin.leads.tags.delete'],
         'sort'  => 2,
     ], [
         'key'   => 'configuration',

diff --git a/packages/Webkul/Admin/src/Resources/views/leads/view/tags.blade.php b/packages/Webkul/Admin/src/Resources/views/leads/view/tags.blade.php
@@ -8,11 +8,17 @@
 @push('scripts')
     <script type="text/x-template" id="tags-component-template">
         <div class="tags-container">
-            <i class="icon tags-icon" @click="is_dropdown_open = ! is_dropdown_open"></i>
+            @if (bouncer()->hasPermission('settings.other_settings.tags.create'))
+                <i class="icon tags-icon" @click="is_dropdown_open = ! is_dropdown_open"></i>
+            @endif
 
             <ul class="tag-list">
                 <li v-for='(tag, index) in tags' :style="'background-color: ' + (tag.color ? tag.color : '#546E7A')">
-                    @{{ tag.name }} <i class="icon close-white-icon" @click="removeTag(tag)"></i>
+                    @{{ tag.name }}
+
+                    @if (bouncer()->hasPermission('settings.other_settings.tags.delete'))
+                        <i class="icon close-white-icon" @click="removeTag(tag)"></i>
+                    @endif
                 </li>
             </ul>
 
@@ -208,7 +214,11 @@ class="control"
 
                             self.$root.addFlashMessages();
                         })
-                        .catch(error => {});
+                        .catch(error => {
+                            window.flashMessages = [{'type': 'error', 'message': error.response.data.message}];
+
+                            self.$root.addFlashMessages()
+                        });
                 },
 
                 removeTag: function(tag) {
@@ -225,6 +235,9 @@ class="control"
                             self.$root.addFlashMessages();
                         })
                         .catch (function (error) {
+                            window.flashMessages = [{'type': 'error', 'message': error.response.data.message}];
+
+                            self.$root.addFlashMessages()
                         })
                 }
             }