Refactor more package signoff stuff

This sets up some shared utility code for use in a later package signoff
email report command.

Signed-off-by: Dan McGee <dan@archlinux.org>

2 files changed, 8 insertions, 8 deletions

diff --git a/templates/packages/signoff_cell.html b/templates/packages/signoff_cell.html
index fce5d551..87216193 100644
--- a/templates/packages/signoff_cell.html
+++ b/templates/packages/signoff_cell.html
@@ -5,8 +5,8 @@
 </ul>
 {% if group.user_signed_off %}
 <div><a class="signoff-link" href="{{ group.package.get_absolute_url }}signoff/revoke/"
-        title="Revoke signoff {{ group.package.pkgname }} for {{ group.package.arch }}">Revoke Signoff</a></div>
+        title="Revoke signoff {{ group.pkgbase }} for {{ group.arch }}">Revoke Signoff</a></div>
 {% else %}
 <div><a class="signoff-link" href="{{ group.package.get_absolute_url }}signoff/"
-        title="Signoff {{ group.package.pkgname }} for {{ group.package.arch }}">Signoff</a></div>
+        title="Signoff {{ group.pkgbase }} for {{ group.arch }}">Signoff</a></div>
 {% endif %}
diff --git a/templates/packages/signoffs.html b/templates/packages/signoffs.html
index 4a2f6c99..8d57a8c5 100644
--- a/templates/packages/signoffs.html
+++ b/templates/packages/signoffs.html
@@ -34,6 +34,7 @@
                 <th>Package Base/Version</th>
                 <th>Arch</th>
                 <th>Target Repo</th>
+                <th>Packager</th>
                 <th># of Packages</th>
                 <th>Last Updated</th>
                 <th>Approved</th>
@@ -42,18 +43,17 @@
         </thead>
         <tbody id="tbody_signoffs">
             {% for group in signoff_groups %}
-            {% with group.package as pkg %}
-            <tr class="{% cycle 'odd' 'even' %} {{ pkg.arch.name }}">
-                <td>{% pkg_details_link pkg %} {{ pkg.full_version }}</td>
-                <td>{{ pkg.arch.name }}</td>
+            <tr class="{% cycle 'odd' 'even' %} {{ group.arch.name }}">
+                <td>{% pkg_details_link group.package %} {{ group.version }}</td>
+                <td>{{ group.arch.name }}</td>
                 <td>{{ group.target_repo }}</td>
+                <td>{{ group.packager|default:"Unknown" }}</td>
                 <td>{{ group.packages|length }}</td>
-                <td>{{ pkg.last_update|date }}</td>
+                <td>{{ group.last_update|date }}</td>
                 <td class="signoff-{{ group.approved|yesno }}">
                     {{ group.approved|yesno|capfirst }}</td>
                 <td>{% include "packages/signoff_cell.html" %}</td>
             </tr>
-            {% endwith %}
             {% endfor %}
         </tbody>
     </table>