From 44ad5cd046bdaac07717c9ec155ce939e3e7d846 Mon Sep 17 00:00:00 2001
From: Abhijeet Kasurde <akasurde@redhat.com>
Date: Mar 03 2017 14:37:30 +0000
Subject: Add merge status column in pull requests page


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

Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>

---

diff --git a/pagure/templates/user_requests.html b/pagure/templates/user_requests.html
index 1515969..df6377a 100644
--- a/pagure/templates/user_requests.html
+++ b/pagure/templates/user_requests.html
@@ -45,6 +45,7 @@
               <th class="nowrap">#</th>
               <th>Status</th>
               <th>Title</th>
+              <th>Merge Status</th>
               <th class="open_date nowrap">Opened</th>
               <th class="nowrap">Project</th>
               <th class="nowrap">Opened by</th>
@@ -79,6 +80,15 @@
                 {{ request.title | noJS("img") | safe }}
               </a>
             </td>
+            <td>
+              <span class="label {%
+                if request.merge_status|lower in ['no_change', 'fforward'] %}label-success{%
+                elif request.merge_status|lower == 'conflicts' %}label-danger{%
+                elif request.merge_status|lower == 'merge' %}label-primary{%
+                endif%}">
+                {{request.merge_status or 'No Status' | lower}}
+              </span>
+            </td>
             <td class="nowrap">
               <span title="{{request.date_created.strftime('%Y-%m-%d %H:%M:%S')}}">{{
                 request.date_created | humanize}}</span>
@@ -109,7 +119,7 @@
           </tr>
         {% endfor %}
           <tr>
-            <td colspan="7" class="pr-status noresult" style="display:none;">
+            <td colspan="8" class="pr-status noresult" style="display:none;">
               No pull-requests found
             </td>
           </tr>