From 4d55f35d4c2b0ab75286eb34d6379b3f823e93ca Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Sep 19 2018 08:54:22 +0000
Subject: Drop the roadmap_on_issues_page project setting


With the new UI introduced in 5.0, this setting is no longer needed
nor interesting, so we are just removing it.

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

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

---

diff --git a/pagure/lib/model.py b/pagure/lib/model.py
index d23f426..853f723 100644
--- a/pagure/lib/model.py
+++ b/pagure/lib/model.py
@@ -626,7 +626,6 @@ class Project(BASE):
             "fedmsg_notifications": True,
             "stomp_notifications": True,
             "pull_request_access_only": False,
-            "roadmap_on_issues_page": False,
             "notify_on_pull-request_flag": False,
             "notify_on_commit_flag": False,
             "issue_tracker_read_only": False,
@@ -642,6 +641,10 @@ class Project(BASE):
                     current[key] = int(current[key])
                 elif is_true(current[key]):
                     current[key] = True
+            # Update the current dict, removing the old keys
+            for key in sorted(current):
+                if key not in default:
+                    del current[key]
             return current
         else:
             return default
diff --git a/pagure/templates/repo_master.html b/pagure/templates/repo_master.html
index 7f9e5e2..1f09789 100644
--- a/pagure/templates/repo_master.html
+++ b/pagure/templates/repo_master.html
@@ -160,7 +160,7 @@
           </div>
         {% endif %}
         <div class="btn-group">
-        <a href="#" 
+        <a href="#"
             class="btn btn-sm dropdown-toggle btn-outline-primary"
             data-toggle="dropdown" id="watch-button">
           <i class="fa fa-clone fa-fw"></i>
@@ -260,16 +260,11 @@
             <a {%
               if select == 'issues' %}class="active nav-link" {%
               else %}class="nav-link" {%
-              endif %}href={% if not repo.settings.get(
-                  'roadmap_on_issues_page', False) %}"{{ url_for(
+              endif %}href="{{ url_for(
                   'ui_ns.view_issues',
                   repo=repo.name,
                   username=username,
-                  namespace=repo.namespace) }}"{% else %}"{{ url_for(
-                  'ui_ns.view_roadmap',
-                  repo=repo.name,
-                  username=username,
-                  namespace=repo.namespace) }}"{% endif %}>
+                  namespace=repo.namespace) }}">
                 <i class="fa fa-fw text-muted fa-exclamation-circle"></i>
                 <span class="d-none d-md-inline">Issues&nbsp;</span>
                 <span class="badge badge-secondary py-0 d-none d-md-inline">
diff --git a/tests/test_pagure_flask_ui_issues.py b/tests/test_pagure_flask_ui_issues.py
index d96af01..6977406 100644
--- a/tests/test_pagure_flask_ui_issues.py
+++ b/tests/test_pagure_flask_ui_issues.py
@@ -625,43 +625,6 @@ class PagureFlaskIssuestests(tests.Modeltests):
 
     @patch('pagure.lib.git.update_git')
     @patch('pagure.lib.notify.send_email')
-    def test_view_issues_roadmap_view(self, p_send_email, p_ugt):
-        """ Test the view_issues endpoint when view is set as roadmap view """
-        p_send_email.return_value = True
-        p_ugt.return_value = True
-
-        tests.create_projects(self.session)
-        tests.create_projects_git(
-            os.path.join(self.path, 'repos'), bare=True)
-
-        # Change settings to show roadmap on issue page
-        repo = pagure.lib.get_authorized_project(self.session, 'test')
-        old_settings = repo.settings
-        old_settings['roadmap_on_issues_page'] = True
-        repo.settings = old_settings
-
-        self.session.add(repo)
-        self.session.commit()
-
-        # check on landing page of project for the URL that on the Issues tab
-        output = self.app.get('/test/')
-        self.assertEqual(output.status_code, 200)
-        self.assertIn('<a class="nav-link" href="/test/roadmap"', output.get_data(as_text=True))
-
-        # Revert and check
-        old_settings = repo.settings
-        old_settings['roadmap_on_issues_page'] = False
-        repo.settings = old_settings
-
-        self.session.add(repo)
-        self.session.commit()
-
-        output = self.app.get('/test/')
-        self.assertEqual(output.status_code, 200)
-        self.assertIn('<a class="nav-link" href="/test/issues"', output.get_data(as_text=True))
-
-    @patch('pagure.lib.git.update_git')
-    @patch('pagure.lib.notify.send_email')
     def test_view_issues(self, p_send_email, p_ugt):
         """ Test the view_issues endpoint. """
         p_send_email.return_value = True
diff --git a/tests/test_pagure_lib_git.py b/tests/test_pagure_lib_git.py
index 2804441..84d44a9 100644
--- a/tests/test_pagure_lib_git.py
+++ b/tests/test_pagure_lib_git.py
@@ -1697,7 +1697,7 @@ new file mode 100644
 index 0000000..60f7480
 --- /dev/null
 +++ b/456
-@@ -0,0 +1,141 @@
+@@ -0,0 +1,139 @@
 +{
 +    "assignee": null,
 +    "branch": "master",
@@ -1753,7 +1753,6 @@ index 0000000..60f7480
 +            "project_documentation": false,
 +            "pull_request_access_only": false,
 +            "pull_requests": true,
-+            "roadmap_on_issues_page": false,
 +            "stomp_notifications": true
 +        },
 +        "tags": [],
@@ -1810,7 +1809,6 @@ index 0000000..60f7480
 +            "project_documentation": false,
 +            "pull_request_access_only": false,
 +            "pull_requests": true,
-+            "roadmap_on_issues_page": false,
 +            "stomp_notifications": true
 +        },
 +        "tags": [],