Fix issues with tags with spaces not showing up in Edit Template. (#307)

Use the tag specific methods in TemplateService to display tags in EditTemplate and TemplateList.
Briskine · May 9, 2019 · 35805ef · 35805ef
1 parent 9cad425
commit 35805ef
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "gorgias",
-    "version": "6.1.0",
+    "version": "6.1.1",
     "description": "Gorgias grunt package",
     "main": "index.js",
     "scripts": {

diff --git a/src/background/js/controllers/includes/template_form.js b/src/background/js/controllers/includes/template_form.js
@@ -267,7 +267,10 @@ gApp.controller('TemplateFormCtrl',
                                 setTimeout(function(){ tinymce.activeEditor.setContent(self.selectedTemplate.body); }, 100);
 
                             }
-                            $.each(self.selectedTemplate.tags.split(','), function (_, tag) {
+
+                            // get tags from template service, to be cleaned-up.
+                            var tags = TemplateService.tags(self.selectedTemplate);
+                            $.each(tags, function (_, tag) {
                                 $('#qt-tags')[0].selectize.addItem($.trim(tag));
                             });
 

diff --git a/src/background/js/controllers/list.js b/src/background/js/controllers/list.js
@@ -486,4 +486,8 @@ gApp.controller('ListCtrl',
             });
             exporter.downloadCsv(itemsFormatted);
         };
+
+        $scope.getTags = function (template) {
+            return TemplateService.tags(template);
+        };
     });
diff --git a/src/manifest.json b/src/manifest.json
@@ -1,7 +1,7 @@
 {
     "manifest_version": 2,
     "name": "__MSG_extName__",
-    "version": "6.1.0",
+    "version": "6.1.1",
     "description": "__MSG_extDesc__",
     "short_name": "Gorgias",
     "default_locale": "en",

diff --git a/src/pages/views/list.html b/src/pages/views/list.html
@@ -72,7 +72,7 @@ <h4 class="list-group-item-heading">
                                   ng-bind-html="template.body| stripHTML | truncate:100 | newlines | safe"></span>
                         </p>
                         <p class="list-group-item-text quicktext-tags" ng-if="template.tags">
-                        <div class="label-wrapper" ng-repeat="tag in template.tags.split(', ')">
+                        <div class="label-wrapper" ng-repeat="tag in getTags(template)">
                             <span class="tag" ng-if="tag">
                                 <strong ng-if="filterTags.indexOf(tag) !== -1"><i class="fa fa-hashtag icon"></i>{{tag}} </strong>
                                 <span ng-if="filterTags.indexOf(tag) === -1"><i class="fa fa-hashtag icon"></i>{{tag}} </span>