Merge pull request #3645 from /issues/3644/1

Fixes #3644 - Add a "moved" milestone
webcompat · Nov 21, 2021 · 67f2831 · 67f2831
2 parents bd8e621 + c64b8b9
commit 67f2831
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 7 deletions.
diff --git a/config/environment.py b/config/environment.py
@@ -98,9 +98,10 @@
     'fixed': {'id': 0, 'order': 2, 'state': 'closed'},
     'incomplete': {'id': 0, 'order': 3, 'state': 'closed'},
     'invalid': {'id': 0, 'order': 4, 'state': 'closed'},
-    'non-compat': {'id': 0, 'order': 5, 'state': 'closed'},
-    'wontfix': {'id': 0, 'order': 6, 'state': 'closed'},
-    'worksforme': {'id': 0, 'order': 7, 'state': 'closed'}}
+    'moved': {'id': 0, 'order': 5, 'state': 'closed'},
+    'non-compat': {'id': 0, 'order': 6, 'state': 'closed'},
+    'wontfix': {'id': 0, 'order': 7, 'state': 'closed'},
+    'worksforme': {'id': 0, 'order': 8, 'state': 'closed'}}
 
 # We don't need to compute for every requests.
 OPEN_STATUSES = [status for status in STATUSES

diff --git a/tests/fixtures/config/milestones_content.json b/tests/fixtures/config/milestones_content.json
diff --git a/tests/fixtures/config/milestones_content_plus.json b/tests/fixtures/config/milestones_content_plus.json
diff --git a/tests/unit/test_config.py b/tests/unit/test_config.py
@@ -39,7 +39,7 @@ def tearDown(self):
 
     def test_update_status_config(self):
         """Update statuses with real milestones id."""
-        expected = {'sitewait': {'state': 'open', 'id': 5, 'order': 5}, 'worksforme': {'state': 'closed', 'id': 11, 'order': 7}, 'non-compat': {'state': 'closed', 'id': 12, 'order': 5}, 'needsdiagnosis': {'state': 'open', 'id': 2, 'order': 2}, 'contactready': {'state': 'open', 'id': 4, 'order': 4}, 'wontfix': {'state': 'closed', 'id': 6, 'order': 6}, 'needscontact': {'state': 'open', 'id': 3, 'order': 3}, 'invalid': {'state': 'closed', 'id': 8, 'order': 4}, 'needstriage': {'state': 'open', 'id': 1, 'order': 1}, 'duplicate': {'state': 'closed', 'id': 10, 'order': 1}, 'fixed': {'state': 'closed', 'id': 9, 'order': 2}, 'incomplete': {'state': 'closed', 'id': 7, 'order': 3}}  # noqa
+        expected = {'sitewait': {'state': 'open', 'id': 5, 'order': 5}, 'worksforme': {'state': 'closed', 'id': 11, 'order': 8}, 'non-compat': {'state': 'closed', 'id': 12, 'order': 6}, 'needsdiagnosis': {'state': 'open', 'id': 2, 'order': 2}, 'contactready': {'state': 'open', 'id': 4, 'order': 4}, 'wontfix': {'state': 'closed', 'id': 6, 'order': 7}, 'needscontact': {'state': 'open', 'id': 3, 'order': 3}, 'invalid': {'state': 'closed', 'id': 8, 'order': 4}, 'needstriage': {'state': 'open', 'id': 1, 'order': 1}, 'duplicate': {'state': 'closed', 'id': 10, 'order': 1}, 'fixed': {'state': 'closed', 'id': 9, 'order': 2}, 'incomplete': {'state': 'closed', 'id': 7, 'order': 3}, 'moved': {'state': 'closed', 'id': 13, 'order': 5}}  # noqa
         # Normal Case
         milestones_json = json_data('milestones_content.json')
         actual = update_status_config(milestones_json)

diff --git a/webcompat/static/js/lib/models/issue.js b/webcompat/static/js/lib/models/issue.js
@@ -43,6 +43,7 @@ export const Issue = Backbone.Model.extend({
     var milestoneClass;
     if (response.milestone) {
       milestone = response.milestone.title;
+      milestoneClass = response.milestone.title;
     } else {
       if (isLoggedIn) {
         milestone = "Fix me: assign a status";

diff --git a/webcompat/templates/__init__.py b/webcompat/templates/__init__.py
@@ -131,6 +131,7 @@ def format_milestone_title(issue_data):
         'sitewait': 'Site Contacted',
         'wontfix': 'Won\'t Fix',
         'worksforme': 'Works For Me',
+        'moved': 'Moved'
     }
     state = issue_data.get('state')
     milestone = issue_data.get('milestone')

diff --git a/webcompat/templates/issue/issue-milestones.jst b/webcompat/templates/issue/issue-milestones.jst
@@ -15,5 +15,5 @@
     <span class="label label-<%= data.milestoneClass %> js-Milestone">
       <%= data.milestone %>
     </span>
-  </span>
+  </div>
 </script>