From 4c5425ce59b5a8c4d2e550be4e4ce2c360bc5478 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jun 20 2018 07:31:15 +0000
Subject: Adjust the milestone link to point to the new page


Fixes https://pagure.io/pagure/issue/3340

Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/pagure/templates/issue.html b/pagure/templates/issue.html
index 190efc6..572d663 100644
--- a/pagure/templates/issue.html
+++ b/pagure/templates/issue.html
@@ -297,7 +297,7 @@ namespace=repo.namespace, repo=repo.name, issueid=issueid)
               {% if issue.milestone %}
               <span>
                 <a href="{{ url_for(
-                    'ui_ns.view_roadmap',
+                    'ui_ns.view_milestone',
                     repo=repo.name,
                     username=username,
                     namespace=repo.namespace,
diff --git a/tests/test_pagure_flask_ui_issues.py b/tests/test_pagure_flask_ui_issues.py
index c07590c..02018a8 100644
--- a/tests/test_pagure_flask_ui_issues.py
+++ b/tests/test_pagure_flask_ui_issues.py
@@ -543,7 +543,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 output_text)
             self.assertIn(
                 '<div id="milestone_plain">\n              <span>'
-                '\n                <a href="/test/roadmap?milestone=v2.0">'
+                '\n                <a href="/test/roadmap/v2.0/">'
                 '\n                  v2.0\n', output_text)
 
     @patch('pagure.lib.git.update_git', MagicMock(return_value=True))
@@ -615,7 +615,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 output_text)
             self.assertNotIn(
                 '<div id="milestone_plain">\n              <span>'
-                '\n                <a href="/test/roadmap?milestone=v2.0">'
+                '\n                <a href="/test/roadmap/v2.0/">'
                 '\n                  v2.0\n', output_text)
 
     @patch('pagure.lib.git.update_git')
diff --git a/tests/test_pagure_flask_ui_issues_acl_checks.py b/tests/test_pagure_flask_ui_issues_acl_checks.py
index d0c8fba..71cd2b3 100644
--- a/tests/test_pagure_flask_ui_issues_acl_checks.py
+++ b/tests/test_pagure_flask_ui_issues_acl_checks.py
@@ -125,6 +125,7 @@ class PagureFlaskIssuesACLtests(tests.Modeltests):
         with tests.user_set(self.app.application, user):
             output = self.app.get('/test/issue/1')
             self.assertEqual(output.status_code, 200)
+            output_text = output.get_data(as_text=True)
             # Not author nor admin = No edit
             self.assertNotIn(
                 '<a class="btn btn-primary btn-sm" '
@@ -149,8 +150,8 @@ class PagureFlaskIssuesACLtests(tests.Modeltests):
                 '<label><strong>Milestone</strong></label>',
                 output.get_data(as_text=True))
             self.assertIn(
-                '<a href="/test/roadmap?milestone=77">\n                  77',
-                output.get_data(as_text=True))
+                '\n                <a href="/test/roadmap/77/">'
+                '\n                  77\n', output_text)
             # but can't edit them
             self.assertNotIn(
                 '<select class="form-control c-select" id="milestone" '
@@ -185,6 +186,7 @@ class PagureFlaskIssuesACLtests(tests.Modeltests):
         with tests.user_set(self.app.application, user):
             output = self.app.get('/test/issue/1')
             self.assertEqual(output.status_code, 200)
+            output_text = output.get_data(as_text=True)
             self.assertNotIn(
                 '<a class="btn btn-primary btn-sm" '
                 'href="/test/issue/1/edit" title="Edit this issue">',
@@ -223,7 +225,7 @@ class PagureFlaskIssuesACLtests(tests.Modeltests):
                 '<label><strong>Milestone</strong></label>',
                 output.get_data(as_text=True))
             self.assertIn(
-                '<a href="/test/roadmap?milestone=77">\n                  77',
+                '<a href="/test/roadmap/77/">\n                  77',
                 output.get_data(as_text=True))
 
             # but can't edit them
@@ -389,6 +391,7 @@ class PagureFlaskIssuesACLtests(tests.Modeltests):
         with tests.user_set(self.app.application, user):
             output = self.app.get('/test/issue/1')
             self.assertEqual(output.status_code, 200)
+            output_text = output.get_data(as_text=True)
             # Not author nor admin = No edit
             self.assertNotIn(
                 '<a class="btn btn-primary btn-sm" '
@@ -413,8 +416,8 @@ class PagureFlaskIssuesACLtests(tests.Modeltests):
                 '<label><strong>Milestone</strong></label>',
                 output.get_data(as_text=True))
             self.assertIn(
-                '<a href="/test/roadmap?milestone=77">\n                  77',
-                output.get_data(as_text=True))
+                '<a href="/test/roadmap/77/">\n                  77',
+                output_text)
             # but can't edit them
             self.assertNotIn(
                 '<select class="form-control c-select" id="milestone" '
@@ -449,6 +452,7 @@ class PagureFlaskIssuesACLtests(tests.Modeltests):
         with tests.user_set(self.app.application, user):
             output = self.app.get('/test/issue/1')
             self.assertEqual(output.status_code, 200)
+            output_text = output.get_data(as_text=True)
 
             # the user can't edit the issue
             self.assertNotIn(
@@ -483,8 +487,8 @@ class PagureFlaskIssuesACLtests(tests.Modeltests):
                 '<label><strong>Milestone</strong></label>',
                 output.get_data(as_text=True))
             self.assertIn(
-                '<a href="/test/roadmap?milestone=77">\n                  77',
-                output.get_data(as_text=True))
+                '<a href="/test/roadmap/77/">\n                  77',
+                output_text)
 
             # can edit them
             self.assertIn(
@@ -652,6 +656,7 @@ class PagureFlaskIssuesACLtests(tests.Modeltests):
         with tests.user_set(self.app.application, user):
             output = self.app.get('/test/issue/1')
             self.assertEqual(output.status_code, 200)
+            output_text = output.get_data(as_text=True)
             # Not author nor admin = No edit
             self.assertNotIn(
                 '<a class="btn btn-primary btn-sm" '
@@ -676,8 +681,8 @@ class PagureFlaskIssuesACLtests(tests.Modeltests):
                 '<label><strong>Milestone</strong></label>',
                 output.get_data(as_text=True))
             self.assertIn(
-                '<a href="/test/roadmap?milestone=77">\n                  77',
-                output.get_data(as_text=True))
+                '<a href="/test/roadmap/77/">\n                  77',
+                output_text)
             # but can't edit them
             self.assertNotIn(
                 '<select class="form-control c-select" id="milestone" '
@@ -712,6 +717,7 @@ class PagureFlaskIssuesACLtests(tests.Modeltests):
         with tests.user_set(self.app.application, user):
             output = self.app.get('/test/issue/1')
             self.assertEqual(output.status_code, 200)
+            output_text = output.get_data(as_text=True)
 
             # the user can edit the issue
             self.assertIn(
@@ -746,8 +752,8 @@ class PagureFlaskIssuesACLtests(tests.Modeltests):
                 '<label><strong>Milestone</strong></label>',
                 output.get_data(as_text=True))
             self.assertIn(
-                '<a href="/test/roadmap?milestone=77">\n                  77',
-                output.get_data(as_text=True))
+                '<a href="/test/roadmap/77/">\n                  77',
+                output_text)
 
             # can edit them
             self.assertIn(
@@ -914,6 +920,7 @@ class PagureFlaskIssuesACLtests(tests.Modeltests):
         with tests.user_set(self.app.application, user):
             output = self.app.get('/test/issue/1')
             self.assertEqual(output.status_code, 200)
+            output_text = output.get_data(as_text=True)
             # Not author nor admin = No edit
             self.assertNotIn(
                 '<a class="btn btn-primary btn-sm" '
@@ -938,8 +945,8 @@ class PagureFlaskIssuesACLtests(tests.Modeltests):
                 '<label><strong>Milestone</strong></label>',
                 output.get_data(as_text=True))
             self.assertIn(
-                '<a href="/test/roadmap?milestone=77">\n                  77',
-                output.get_data(as_text=True))
+                '<a href="/test/roadmap/77/">\n                  77',
+                output_text)
             # but can't edit them
             self.assertNotIn(
                 '<select class="form-control c-select" id="milestone" '
@@ -974,6 +981,7 @@ class PagureFlaskIssuesACLtests(tests.Modeltests):
         with tests.user_set(self.app.application, user):
             output = self.app.get('/test/issue/1')
             self.assertEqual(output.status_code, 200)
+            output_text = output.get_data(as_text=True)
 
             # the user can edit the issue
             self.assertIn(
@@ -1008,8 +1016,8 @@ class PagureFlaskIssuesACLtests(tests.Modeltests):
                 '<label><strong>Milestone</strong></label>',
                 output.get_data(as_text=True))
             self.assertIn(
-                '<a href="/test/roadmap?milestone=77">\n                  77',
-                output.get_data(as_text=True))
+                '<a href="/test/roadmap/77/">\n                  77',
+                output_text)
 
             # can edit them
             self.assertIn(
diff --git a/tests/test_pagure_flask_ui_roadmap.py b/tests/test_pagure_flask_ui_roadmap.py
index 1f1a80c..50946da 100644
--- a/tests/test_pagure_flask_ui_roadmap.py
+++ b/tests/test_pagure_flask_ui_roadmap.py
@@ -209,6 +209,7 @@ class PagureFlaskRoadmaptests(tests.Modeltests):
                 '<h5 class="pl-2 font-weight-bold text-muted">'
                 'Project Settings</h5>\n', output_text)
             self.assertIn('Milestones updated', output_text)
+
             # Check the result of the action -- Milestones recorded
             self.session.commit()
             repo = pagure.lib.get_authorized_project(self.session, 'test')
@@ -456,6 +457,7 @@ class PagureFlaskRoadmaptests(tests.Modeltests):
                 '<h5 class="pl-2 font-weight-bold text-muted">'
                 'Project Settings</h5>\n', output_text)
             self.assertIn('Milestones updated', output_text)
+
             # Check the result of the action -- Milestones recorded
             self.session.commit()
             repo = pagure.lib._get_project(self.session, 'test')
@@ -521,6 +523,10 @@ class PagureFlaskRoadmaptests(tests.Modeltests):
                     '</button>\n                      '
                     'Issue set to the milestone: %s\n' % mstone,
                     output_text)
+                self.assertIn(
+                    '<div id="milestone_plain">', output_text)
+                self.assertIn(
+                    '<a href="/test/roadmap/%s/">' % mstone, output_text)
 
         repo = pagure.lib.get_authorized_project(self.session, 'test')