Merge pull request #640 from karlcow/436/2

fix #436 Add namespaces to labels
webcompat · Jul 29, 2015 · 1d1deea · 1d1deea
2 parents ceb7e30 + c416e2e
commit 1d1deea
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 6 deletions.
diff --git a/webcompat/static/js/lib/issue-list.js b/webcompat/static/js/lib/issue-list.js
@@ -293,7 +293,7 @@ issueList.IssueView = Backbone.View.extend({
   events: {
     'click .js-issue-label': 'labelSearch',
   },
-  _filterRegex: /&*stage=(new|needscontact|needsdiagnosis|contactready|sitewait|closed)&*/i,
+  _filterRegex: /(stage=(?:new|status-needscontact|status-needsdiagnosis|status-contactready|status-sitewait|status-closed))/ig,
   _isLoggedIn: $('body').data('username'),
   _loadingIndicator: $('.js-loader'),
   _nextButton: $('.js-pagination-next'),

diff --git a/webcompat/static/js/lib/labels.js b/webcompat/static/js/lib/labels.js
@@ -31,7 +31,7 @@ issues.LabelsView = Backbone.View.extend({
   subTemplate: _.template([
     '<% _.each(labels, function(label) { %>',
       '<span class="Label Label--badge" style="background-color:#<%=label.color%>">',
-        '<%= label.name %>',
+        '<%= label.name.replace(/(browser|status)-/, "") %>',
       '</span>',
     '<% }); %>'].join('')),
   render: function() {

diff --git a/webcompat/static/js/lib/models/issue.js b/webcompat/static/js/lib/models/issue.js
@@ -83,6 +83,20 @@
     });
   },
   updateLabels: function(labelsArray) {
+    // maybe this should be in a shared config file outside of python/JS
+    var statusLabels = ['contactready', 'needscontact', 'needsdiagnosis', 'sitewait', ' closed-duplicate', 'closed-fixed', 'closed-invalid'];
+    var browserLabels = ['chrome', 'firefox', 'ie', 'opera', 'safari', 'vivaldi'];
+    var osLabels = ['android', 'fxos', 'ios', 'linux', 'mac', 'win']
+    // we check if we need to append the correct string before sending stuff back
+    for (var i = labelsArray.length - 1; i >= 0; i--) {
+      if (statusLabels.indexOf(labelsArray[i]) != -1) {
+        labelsArray[i] = 'status-'.concat(labelsArray[i])
+      } else if (browserLabels.indexOf(labelsArray[i]) != -1) {
+        labelsArray[i] = 'browser-'.concat(labelsArray[i])
+      } else if (osLabels.indexOf(labelsArray[i]) != -1) {
+        labelsArray[i] = 'os-'.concat(labelsArray[i])
+      };
+    };
     var self = this;
     if (!$.isArray(labelsArray)) {
       return;

diff --git a/webcompat/templates/issue-list.html b/webcompat/templates/issue-list.html
@@ -75,7 +75,7 @@
             </div>
             <div class="wc-IssueItem-section">
               <span class="wc-IssueItem-label js-issue-label"><% _.each(issue.labels, function(label) { %>
-                <a href="#" class="wc-Labels" title="Labels : <%= label.name %>"><%= label.name %></a>
+                <a href="#" class="wc-Labels" title="Labels : <%= label.name.replace(/(browser|status)-/, '') %>"><%= label.name.replace(/(browser|status)-/, '') %></a>
               <% }); %></span>
             </div>
           </div>

diff --git a/webcompat/templates/issue.html b/webcompat/templates/issue.html
@@ -30,7 +30,7 @@ <h1 class="wc-IssueDetail-title wc-Title--l">
           <span class="Label-list">
           <% _.each(labels, function(label) { %>
             <span class="Label Label--badge" style="background-color:#<%=label.color%>">
-              <%= label.name %>
+              <%= label.name.replace(/(browser|status)-/, '') %>
             </span>
           <% }); %>
           </span>
@@ -123,9 +123,9 @@ <h1 class="wc-IssueDetail-title wc-Title--l">
           <% _.each(labels, function(label) { %>
             <label class="LabelEditor-item">
               <span class="LabelEditor-color" style="background-color:#<%=label.color%>">
-                <input class="LabelEditor-checkbox" type="checkbox" name="<%= label.name %>" data-color="<%=label.color%>">
+                <input class="LabelEditor-checkbox" type="checkbox" name="<%= label.name.replace(/(browser|status)-/, '') %>" data-color="<%=label.color%>">
               </span>
-              <span class="LabelEditor-name"><%= label.name %></span>
+              <span class="LabelEditor-name"><%= label.name.replace(/(browser|status)-/, '') %></span>
               </label>
             <% }); %>
           </div>