From 4beb849715cb2c6164e2b74d5acf5c24e21b881f Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Sep 12 2016 10:58:03 +0000
Subject: [PATCH 1/6] Add the opportunity to list all issues, opened and closed


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

---

diff --git a/pagure/templates/issues.html b/pagure/templates/issues.html
index 2fed964..b4b1cc1 100644
--- a/pagure/templates/issues.html
+++ b/pagure/templates/issues.html
@@ -39,31 +39,33 @@
 
 <section id="tags">
   <span class="btn-group btn-group-sm issues-tagbar" role="group" aria-label="Basic example">
-    {% if status and status != 'Open' %}
-      <a class="btn btn-secondary btn-sm" href="{{ url_for('view_issues',
-        repo=repo.name,
-        username=username,
-        namespace=repo.namespace,
-        tags=tags, author=author, assignee=assignee) }}">Open</a>
-      <a class="btn btn-primary btn-sm" href="{{ url_for('view_issues',
-        repo=repo.name,
-        username=username,
-        namespace=repo.namespace,
-        status='Closed', tags=tags, author=author,
-        assignee=assignee) }}">Closed</a>
-    {% else %}
-      <a class="btn btn-primary btn-sm" href="{{ url_for('view_issues',
-        repo=repo.name,
-        username=username,
-        namespace=repo.namespace,
-        tags=tags, author=author, assignee=assignee) }}">Open</a>
-      <a class="btn btn-secondary btn-sm" href="{{ url_for('view_issues',
-        repo=repo.name,
-        username=username,
-        namespace=repo.namespace,
-        status='Closed', tags=tags, author=author,
-        assignee=assignee) }}">Closed</a>
-    {% endif %}
+      <a class="btn {%
+        if status|lower in ['open', 'true'] %}btn-primary{%
+        else %}btn-secondary{%
+        endif %} btn-sm" href="{{ url_for('view_issues',
+          repo=repo.name,
+          username=username,
+          namespace=repo.namespace,
+          tags=tags, author=author,
+          assignee=assignee) }}">Open</a>
+      <a class="btn {%
+        if status|lower in ['closed', 'false'] %}btn-primary{%
+        else %}btn-secondary{%
+        endif %} btn-sm" href="{{ url_for('view_issues',
+          repo=repo.name,
+          username=username,
+          namespace=repo.namespace,
+          tags=tags, author=author, status='Closed',
+          assignee=assignee) }}">Close</a>
+      <a class="btn {%
+        if status|lower in ['all', 'none'] %}btn-primary{%
+        else %}btn-secondary{%
+        endif %} btn-sm" href="{{ url_for('view_issues',
+          repo=repo.name,
+          username=username,
+          namespace=repo.namespace,
+          tags=tags, author=author, status='all',
+          assignee=assignee) }}">All</a>
   </span>
   <span class="oi m-l-2" data-glyph="tag"></span>
   <span class="btn-group btn-group-sm issues-tagbar" role="group" aria-label="Basic example">
@@ -143,7 +145,7 @@
         <tr>
             <td>
               <span class="label label-default">#{{ issue.id }}</span>
-              {% if status and status != 'Open' %}
+              {% if status != 'Open' %}
               <span class="label {% if
                 issue.status|lower == 'invalid' %}label-danger{%
                 elif issue.status|lower == 'fixed' %}label-success{%
diff --git a/pagure/ui/issues.py b/pagure/ui/issues.py
index d538d60..b6edb11 100644
--- a/pagure/ui/issues.py
+++ b/pagure/ui/issues.py
@@ -400,7 +400,7 @@ def remove_tag(repo, username=None, namespace=None):
 def view_issues(repo, username=None, namespace=None):
     """ List all issues associated to a repo
     """
-    status = flask.request.args.get('status', None)
+    status = flask.request.args.get('status', 'Open')
     priority = flask.request.args.get('priority', None)
     tags = flask.request.args.getlist('tags')
     tags = [tag.strip() for tag in tags if tag.strip()]
@@ -426,6 +426,9 @@ def view_issues(repo, username=None, namespace=None):
     if flask.g.repo_admin:
         private = None
 
+    if str(status).lower() in ['all']:
+        status = None
+
     oth_issues = None
     if status is not None:
         if status.lower() == 'closed':
@@ -464,11 +467,9 @@ def view_issues(repo, username=None, namespace=None):
 
     else:
         issues = pagure.lib.search_issues(
-            SESSION, repo, status='Open', tags=tags, assignee=assignee,
+            SESSION, repo, tags=tags, assignee=assignee,
             author=author, private=private, priority=priority)
-        oth_issues = pagure.lib.search_issues(
-            SESSION, repo, closed=True, tags=tags, assignee=assignee,
-            author=author, private=private, priority=priority, count=True)
+        oth_issues = []
 
     tag_list = pagure.lib.get_tags_of_project(SESSION, repo)
 

From d3b388083e2a82350d4d0e698a719985df921ae6 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Sep 12 2016 10:58:44 +0000
Subject: [PATCH 2/6] Add the opportunity to list all PRs, opened and closed


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

---

diff --git a/pagure/templates/requests.html b/pagure/templates/requests.html
index e52480b..9fc5709 100644
--- a/pagure/templates/requests.html
+++ b/pagure/templates/requests.html
@@ -38,7 +38,7 @@
   </h2>
 
 <div>
-  <span class="btn-group btn-group-sm issues-tagbar" role="group" aria-label="Basic example">
+  <span class="btn-group btn-group-sm issues-tagbar" role="group">
       <a class="btn {%
             if status|lower in ['open', 'true'] %}btn-primary{%
             else %}btn-secondary{%
@@ -48,14 +48,23 @@
                 username=username,
                 namespace=repo.namespace) }}">Open</a>
       <a class="btn {%
-        if status|lower in ['open', 'true'] %}btn-secondary{%
-        else %}btn-primary{%
+        if status|lower in ['closed', 'false'] %}btn-primary{%
+        else %}btn-secondary{%
         endif %} btn-sm" href="{{ url_for(
             'request_pulls',
             repo=repo.name,
             username=username,
             namespace=repo.namespace,
             status=0) }}">Closed</a>
+      <a class="btn {%
+        if status|lower in ['all', 'none'] %}btn-primary{%
+        else %}btn-secondary{%
+        endif %} btn-sm" href="{{ url_for(
+            'request_pulls',
+            repo=repo.name,
+            username=username,
+            namespace=repo.namespace,
+            status='all') }}">All</a>
   </span>
   <a class="btn btn-secondary btn-sm pull-xs-right" href="{{ url_for(
     'request_pulls',
diff --git a/pagure/ui/fork.py b/pagure/ui/fork.py
index 70fc946..bfcd8b7 100644
--- a/pagure/ui/fork.py
+++ b/pagure/ui/fork.py
@@ -150,6 +150,8 @@ def request_pulls(repo, username=None, namespace=None):
 
     if str(status).lower() in ['false', '0']:
         status = False
+    elif str(status).lower() in ['all']:
+        status = None
 
     if str(status).lower() in ['true', '1', 'open']:
         requests = pagure.lib.search_pull_requests(

From 5657d29898c54de408ca8206249e59a9647052f9 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Sep 12 2016 10:58:44 +0000
Subject: [PATCH 3/6] Order the issues, most recent first, all the time


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

---

diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py
index 9a4c7e7..6a631eb 100644
--- a/pagure/lib/__init__.py
+++ b/pagure/lib/__init__.py
@@ -1823,14 +1823,9 @@ def search_issues(
         model.Issue.project_id == repo.id
     )
 
-    if closed:
-        query = query.order_by(
-            model.Issue.date_created.desc()
-        )
-    else:
-        query = query.order_by(
-            model.Issue.id
-        )
+    query = query.order_by(
+        model.Issue.date_created.desc()
+    )
 
     if issueid is not None or issueuid is not None:
         output = query.first()

From b1df3ce7ab8372f1b9fd226bdbb3fa6ad7ad0fe6 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Sep 12 2016 10:59:00 +0000
Subject: [PATCH 4/6] Fix displaying the status of the issues shown


---

diff --git a/pagure/templates/issues.html b/pagure/templates/issues.html
index b4b1cc1..cb1b5ea 100644
--- a/pagure/templates/issues.html
+++ b/pagure/templates/issues.html
@@ -9,10 +9,12 @@
 
 
   <h2>
-    {% if status and status != 'Open' %}
+    {% if status|lower in ['open', 'true'] %}
+      {{ issues|count }} Open Issues
+    {% elif status|lower not in ['open', 'true', 'all', 'none'] %}
       {{ issues|count }} Closed Issues
     {% else %}
-      {{ issues|count }} Open Issues
+      {{ issues|count }} Issues
     {% endif %}
     <span class="btn-group btn-group-sm pull-xs-right" role="group">
     {% if repo.milestones %}
@@ -38,7 +40,7 @@
     {% endif %}
 
 <section id="tags">
-  <span class="btn-group btn-group-sm issues-tagbar" role="group" aria-label="Basic example">
+  <span class="btn-group btn-group-sm issues-tagbar" role="group">
       <a class="btn {%
         if status|lower in ['open', 'true'] %}btn-primary{%
         else %}btn-secondary{%

From 9289725cdf4bfd668251a8353ef04c0d4c2ede9f Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Sep 12 2016 10:59:00 +0000
Subject: [PATCH 5/6] Adjust unit-tests for the change in ordering of the issues returned/shown


---

diff --git a/tests/test_pagure_flask_api_issue.py b/tests/test_pagure_flask_api_issue.py
index b1324ab..f723942 100644
--- a/tests/test_pagure_flask_api_issue.py
+++ b/tests/test_pagure_flask_api_issue.py
@@ -310,16 +310,16 @@ class PagureFlaskApiIssuetests(tests.Modeltests):
                   "assignee": None,
                   "blocks": [],
                   "comments": [],
-                  "content": "This issue needs attention",
+                  "content": "We should work on this",
                   "date_created": "1431414800",
                   "closed_at": None,
                   "depends": [],
-                  "id": 1,
+                  "id": 2,
                   "priority": None,
-                  "private": False,
+                  "private": True,
                   "status": "Open",
                   "tags": [],
-                  "title": "test issue",
+                  "title": "Test issue",
                   "user": {
                     "fullname": "PY C",
                     "name": "pingou"
@@ -329,16 +329,16 @@ class PagureFlaskApiIssuetests(tests.Modeltests):
                   "assignee": None,
                   "blocks": [],
                   "comments": [],
-                  "content": "We should work on this",
+                  "content": "This issue needs attention",
                   "date_created": "1431414800",
                   "closed_at": None,
                   "depends": [],
-                  "id": 2,
+                  "id": 1,
                   "priority": None,
-                  "private": True,
+                  "private": False,
                   "status": "Open",
                   "tags": [],
-                  "title": "Test issue",
+                  "title": "test issue",
                   "user": {
                     "fullname": "PY C",
                     "name": "pingou"
@@ -405,16 +405,16 @@ class PagureFlaskApiIssuetests(tests.Modeltests):
                         "assignee": None,
                         "blocks": [],
                         "comments": [],
-                        "content": "This issue needs attention",
+                        "content": "We should work on this",
                         "date_created": "1431414800",
                         "closed_at": None,
                         "depends": [],
-                        "id": 1,
+                        "id": 2,
                         "priority": None,
-                        "private": False,
+                        "private": True,
                         "status": "Open",
                         "tags": [],
-                        "title": "test issue",
+                        "title": "Test issue",
                         "user": {
                             "fullname": "PY C",
                             "name": "pingou"
@@ -424,16 +424,16 @@ class PagureFlaskApiIssuetests(tests.Modeltests):
                         "assignee": None,
                         "blocks": [],
                         "comments": [],
-                        "content": "We should work on this",
+                        "content": "This issue needs attention",
                         "date_created": "1431414800",
                         "closed_at": None,
                         "depends": [],
-                        "id": 2,
+                        "id": 1,
                         "priority": None,
-                        "private": True,
+                        "private": False,
                         "status": "Open",
                         "tags": [],
-                        "title": "Test issue",
+                        "title": "test issue",
                         "user": {
                             "fullname": "PY C",
                             "name": "pingou"
diff --git a/tests/test_pagure_lib.py b/tests/test_pagure_lib.py
index ec7027f..f57522b 100644
--- a/tests/test_pagure_lib.py
+++ b/tests/test_pagure_lib.py
@@ -484,14 +484,14 @@ class PagureLibtests(tests.Modeltests):
         # All issues
         issues = pagure.lib.search_issues(self.session, repo)
         self.assertEqual(len(issues), 2)
-        self.assertEqual(issues[0].id, 1)
-        self.assertEqual(issues[0].project_id, 1)
-        self.assertEqual(issues[0].status, 'Open')
-        self.assertEqual(issues[0].tags, [])
-        self.assertEqual(issues[1].id, 2)
+        self.assertEqual(issues[1].id, 1)
         self.assertEqual(issues[1].project_id, 1)
-        self.assertEqual(issues[1].status, 'Invalid')
+        self.assertEqual(issues[1].status, 'Open')
         self.assertEqual(issues[1].tags, [])
+        self.assertEqual(issues[0].id, 2)
+        self.assertEqual(issues[0].project_id, 1)
+        self.assertEqual(issues[0].status, 'Invalid')
+        self.assertEqual(issues[0].tags, [])
 
         # Issues by status
         issues = pagure.lib.search_issues(
@@ -637,8 +637,8 @@ class PagureLibtests(tests.Modeltests):
         issues = pagure.lib.search_issues(
             self.session, repo, assignee=False)
         self.assertEqual(len(issues), 2)
-        self.assertEqual(issues[0].id, 1)
-        self.assertEqual(issues[1].id, 2)
+        self.assertEqual(issues[0].id, 2)
+        self.assertEqual(issues[1].id, 1)
 
         issues = pagure.lib.search_issues(
             self.session, repo, assignee=True)

From 59d698fcfe58ca36dcf4da304a84597ab36ea4db Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Sep 12 2016 10:59:00 +0000
Subject: [PATCH 6/6] Add unit-tests for showing all the tickets and checking the title given


---

diff --git a/tests/test_pagure_flask_ui_issues.py b/tests/test_pagure_flask_ui_issues.py
index 17764c3..ff4b7bb 100644
--- a/tests/test_pagure_flask_ui_issues.py
+++ b/tests/test_pagure_flask_ui_issues.py
@@ -260,6 +260,18 @@ class PagureFlaskIssuestests(tests.Modeltests):
         self.session.commit()
         self.assertEqual(msg.title, 'Test issue')
 
+        msg = pagure.lib.new_issue(
+            session=self.session,
+            repo=repo,
+            title='Test invalid issue',
+            content='This really is not related',
+            user='pingou',
+            status='Invalid',
+            ticketfolder=None
+        )
+        self.session.commit()
+        self.assertEqual(msg.title, 'Test invalid issue')
+
         # Whole list
         output = self.app.get('/test/issues')
         self.assertEqual(output.status_code, 200)
@@ -267,12 +279,12 @@ class PagureFlaskIssuestests(tests.Modeltests):
         self.assertTrue(
             '<h2>\n      1 Open Issues' in output.data)
 
-        # Status = closed
+        # Status = closed (all but open)
         output = self.app.get('/test/issues?status=cloSED')
         self.assertEqual(output.status_code, 200)
         self.assertIn('<title>Issues - test - Pagure</title>', output.data)
         self.assertTrue(
-            '<h2>\n      0 Closed Issues' in output.data)
+            '<h2>\n      1 Closed Issues' in output.data)
 
         # Status = fixed
         output = self.app.get('/test/issues?status=fixed')
@@ -281,6 +293,20 @@ class PagureFlaskIssuestests(tests.Modeltests):
         self.assertTrue(
             '<h2>\n      0 Closed Issues' in output.data)
 
+        # Status = Invalid
+        output = self.app.get('/test/issues?status=Invalid')
+        self.assertEqual(output.status_code, 200)
+        self.assertIn('<title>Issues - test - Pagure</title>', output.data)
+        self.assertTrue(
+            '<h2>\n      1 Closed Issues' in output.data)
+
+        # All tickets
+        output = self.app.get('/test/issues?status=all')
+        self.assertEqual(output.status_code, 200)
+        self.assertIn('<title>Issues - test - Pagure</title>', output.data)
+        self.assertTrue(
+            '<h2>\n      2 Issues' in output.data)
+
         # New issue button is shown
         user = tests.FakeUser()
         with tests.user_set(pagure.APP, user):