From d1f0c39de812e08bf9f53555ed013343cf50fbda Mon Sep 17 00:00:00 2001
From: Pradeep CE (cep) <breathingcode@gmail.com>
Date: Feb 01 2017 17:42:25 +0000
Subject: Better 'My Pull Requests' page


Separate opened requests and requests in projects the user is
subscribed to.

---

diff --git a/pagure/templates/user_requests.html b/pagure/templates/user_requests.html
index a1b1a48..18f31c3 100644
--- a/pagure/templates/user_requests.html
+++ b/pagure/templates/user_requests.html
@@ -1,13 +1,13 @@
 {% extends "master.html" %}
 
-{% block title %}Pull-requests of {{ username }}{% endblock %}
+{% block title %}Pull Requests for {{ username }}{% endblock %}
 
 
 {% block content %}
 <div class="p-t-2">
   <div class="container">
     <h3 class="p-b-2">
-        Pull Requests opened by {{ username | avatar(20) | safe }} {{ username }}
+        Pull Requests for {{ username | avatar(20) | safe }} {{ username }}
     </h3>
     <div>
       <span class="btn-group btn-group-sm issues-tagbar" role="group">
@@ -17,6 +17,81 @@
           <a data-togglebutton="pr-status-all" class="btn btn-secondary btn-sm" href="#">All</a>
       </span>
     </div>
+    <hr>
+
+    <b>Opened Pull Requests</b>
+    <table class="table table-hover table-striped m-b-0 m-t-1">
+        <thead class="thead-default">
+            <tr>
+                <th class="nowrap">#</th>
+                <th>Status</th>
+                <th>Title</th>
+                <th class="open_date nowrap">Opened</th>
+                <th class="nowrap">Project</th>
+                <th class="nowrap">Opened by</th>
+                <th class="assigned nowrap">Assigned to</th>
+            </tr>
+        </thead>
+        <tfoot>
+        </tfoot>
+        <tbody>
+        {% for request in requests|selectattr("user.username", "equalto", username) %}
+            <tr class="pr-status pr-status-{{request.status|lower}}"
+              {%if request.status|lower != "open" %}style="display:none;"{% endif %}>
+                <td class="nowrap"><span class="label label-default">PR#{{ request.id }}</span></td>
+                <td><span class="label {%
+                    if request.status|lower == 'merged' %}label-success{%
+                    elif request.status|lower == 'closed' %}label-danger{%
+                    elif request.status|lower == 'open'%}label-primary{%
+                    endif%}">{{request.status}}</span></td>
+                <td class="stretch-table-column">
+                  <a href="{{ url_for(
+                      'request_pull',
+                      repo=request.project.name,
+                      username=request.project.user.username if request.project.is_fork else None,
+                      namespace=request.project.namespace,
+                      requestid=request.id) }}">
+                    {{ request.title | noJS("img") | safe }}
+                  </a>
+                </td>
+                <td class="nowrap">
+                    <span title="{{request.date_created.strftime('%Y-%m-%d %H:%M:%S')}}">{{
+                        request.date_created | humanize}}</span>
+                </td>
+                <td class="nowrap">
+                  <a href="{{ url_for(
+                    'view_repo',
+                    repo=request.project.name,
+                    username=request.project.user.username if request.project.is_fork else None,
+                    namespace=request.project.namespace) }}">
+                    {{ request.project.user.username + '/' if request.project.is_fork }}
+                    {{ request.project.namespace + '/' if request.project.namespace }}
+                    {{ request.project.name }}
+                  </a>
+                </td>
+                <td class="nowrap">
+                  {{ request.user.default_email | avatar(16) | safe }}
+                  {{ request.user.username }}
+                </td>
+                <td class="nowrap">
+                  {% if request.assignee %}
+                  {{ request.assignee.default_email | avatar(16) | safe }}
+                  {{ request.assignee.user }}
+                  {% else %}
+                  <span class="text-muted">unassigned</span>
+                  {% endif %}
+                </td>
+            </tr>
+        {% else %}
+            <tr>
+                <td colspan="5" class="noresult">No pull-request found</td>
+            </tr>
+        {% endfor %}
+        </tbody>
+    </table>
+    <br>
+
+    <b>Other Pull Requests</b>
     <table class="table table-hover table-striped m-b-0 m-t-1">
         <thead class="thead-default">
             <tr>
@@ -25,13 +100,14 @@
                 <th>Title</th>
                 <th class="open_date nowrap">Opened</th>
                 <th class="nowrap">Project</th>
+                <th class="nowrap">Opened by</th>
                 <th class="assigned nowrap">Assigned to</th>
             </tr>
         </thead>
         <tfoot>
         </tfoot>
         <tbody>
-        {% for request in requests %}
+        {% for request in requests|rejectattr("user.username", "equalto", username) %}
             <tr class="pr-status pr-status-{{request.status|lower}}"
               {%if request.status|lower != "open" %}style="display:none;"{% endif %}>
                 <td class="nowrap"><span class="label label-default">PR#{{ request.id }}</span></td>
@@ -66,6 +142,10 @@
                   </a>
                 </td>
                 <td class="nowrap">
+                  {{ request.user.default_email | avatar(16) | safe }}
+                  {{ request.user.username }}
+                </td>
+                <td class="nowrap">
                   {% if request.assignee %}
                   {{ request.assignee.default_email | avatar(16) | safe }}
                   {{ request.assignee.user }}
@@ -81,6 +161,7 @@
         {% endfor %}
         </tbody>
     </table>
+
   </div>
 </div>