Add delegate column

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

diff --git a/apps/patchwork/utils.py b/apps/patchwork/utils.py
index ba8349a1a037e4eea9c8cdd474b41819802065b6..05e66e26eb0c72bd9b7e0db0378fc9e5d012a1cb 100644 (file)
--- a/apps/patchwork/utils.py
+++ b/apps/patchwork/utils.py
@@ -43,7 +43,8 @@ class Order(object):
         'date':         'date',
         'name':         'name',
         'state':        'state__ordering',
-        'submitter':    'submitter__name'
+        'submitter':    'submitter__name',
+        'delegate':     'delegate__username',
     }
     default_order = 'date'
 

diff --git a/templates/patchwork/patch-list.html b/templates/patchwork/patch-list.html
index 57491e20ccc7fdd15019425b204ff4e6beb5e57c..14a0f0cfd7cd2e87b6cc701d1efb5eb50bf6dbf2 100644 (file)
--- a/templates/patchwork/patch-list.html
+++ b/templates/patchwork/patch-list.html
@@ -67,6 +67,19 @@
    {% endifequal %}
   </th>
 
+  <th>
+   {% ifequal order.name "delegate" %}
+    <a class="colactive"
+     href="{% listurl order=order.reversed_name %}"><img
+     src="/images/16-arrow-{% if order.reversed %}up{% else %}down{%endif%}.png"
+     width="16" height="16"
+    ></a> <a class="colactive"
+     href="{% listurl order=order.reversed_name %}">Delegate</a>
+   {% else %}
+    <a class="colinactive" href="{% listurl order="delegate" %}">Delegate</a>
+   {% endifequal %}
+  </th>
+
   <th>
    {% ifequal order.name "state" %}
     <a class="colactive"
@@ -94,6 +107,7 @@
      >{{ patch.name }}</a></td>
    <td>{{ patch.date|date:"Y-m-d" }}</td>
    <td>{{ patch.submitter|personify }}</td>
+   <td>{{ patch.delegate.username }}</td>
    <td>{{ patch.state }}</td>
   </tr>
  {% endfor %}