From 6afa3130c7dda02637acb789e8e4e4152773bd88 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jun 08 2015 11:51:33 +0000
Subject: Adjust the list of pull-requests returned based on the status asked


Specifying ?status=0 or ?status=False will return all closed or merged
pull-request.
Specifying either ?status=Closed or ?status=Merged will returned what is
asked
Specifying ?status=open or nothing, will returned the opened pull-requests

---

diff --git a/pagure/templates/requests.html b/pagure/templates/requests.html
index 96e7b5c..a814cf5 100644
--- a/pagure/templates/requests.html
+++ b/pagure/templates/requests.html
@@ -8,13 +8,14 @@
 
 <div class="inline">
   <h2>
-    {% if status and (status == False or status|lower == 'closed') %}
-    Closed {% endif -%}
+    {% if status|lower != 'open' and status|lower != 'false' %}
+    {{ status }} {% elif status|lower != 'open' -%}
+    Closed/Merged {% endif -%}
     Pull-requests ({{ requests|count }})
   </h2>
-  {% if status and not (status == False or status|lower == 'closed') %}
+  {% if status|lower == 'open' %}
     <a href="{{ url_for('request_pulls', username=username,
-               repo=repo.name) }}?status=Closed">
+               repo=repo.name) }}?status=0">
       ({{ oth_requests }} Closed)</a>
   {% else %}
     <a href="{{ url_for('request_pulls', username=username,
diff --git a/pagure/ui/fork.py b/pagure/ui/fork.py
index a3ce3d6..ffdab65 100644
--- a/pagure/ui/fork.py
+++ b/pagure/ui/fork.py
@@ -57,17 +57,20 @@ def request_pulls(repo, username=None):
     if not repo.settings.get('pull_requests', True):
         flask.abort(404, 'No pull-requests found for this project')
 
-    if status is False or str(status).lower() == 'closed':
+    if str(status).lower() in ['false', '0']:
+        status = False
+
+    if str(status).lower() in ['true', '1', 'open']:
         requests = pagure.lib.search_pull_requests(
             SESSION,
             project_id=repo.id,
-            status=False,
+            status=True,
             assignee=assignee,
             author=author)
         oth_requests = pagure.lib.search_pull_requests(
             SESSION,
             project_id=repo.id,
-            status=True,
+            status=False,
             assignee=assignee,
             author=author,
             count=True)
@@ -81,7 +84,7 @@ def request_pulls(repo, username=None):
         oth_requests = pagure.lib.search_pull_requests(
             SESSION,
             project_id=repo.id,
-            status=False,
+            status=True,
             assignee=assignee,
             author=author,
             count=True)