summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2012-02-02 18:29:35 -0600
committerDan McGee <dan@archlinux.org>2012-02-07 00:47:21 -0600
commitb2cfd30094b07546bbbdd2c83499cfd3d03f2161 (patch)
treed2a86ecad4fa30a1b3e0712528eb97e088025b11
parent087aca5cceb2dc8ac4625eb61f95b57b704bd30f (diff)
Show the latest flag request on package details if out of date
This only shows up for logged in users, but might be helpful for developers browsing around the site, especially if they did not receive the email themselves, or in the case of orphan packages. Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--main/models.py11
-rw-r--r--sitestatic/archweb.css5
-rw-r--r--templates/packages/details.html5
3 files changed, 21 insertions, 0 deletions
diff --git a/main/models.py b/main/models.py
index d72f2c05..15a92662 100644
--- a/main/models.py
+++ b/main/models.py
@@ -312,6 +312,17 @@ class Package(models.Model):
repo__testing=self.repo.testing, repo__staging=self.repo.staging,
pkgbase=self.pkgbase).exclude(id=self.id)
+ def flag_request(self):
+ if not self.flag_date:
+ return None
+ from packages.models import FlagRequest
+ try:
+ request = FlagRequest.objects.filter(pkgbase=self.pkgbase,
+ repo=self.repo).latest()
+ return request
+ except FlagRequest.DoesNotExist:
+ return None
+
def is_same_version(self, other):
'is this package similar, name and version-wise, to another'
return self.pkgname == other.pkgname \
diff --git a/sitestatic/archweb.css b/sitestatic/archweb.css
index 46fd7844..d653d98c 100644
--- a/sitestatic/archweb.css
+++ b/sitestatic/archweb.css
@@ -728,6 +728,11 @@ div#pkglist-about {
padding: 0.25em 0 0.25em 1.5em;
}
+ #pkgdetails #pkginfo .userdata {
+ font-size: 0.85em;
+ padding: 0.5em;
+ }
+
/* pkgdetails: flag package */
form#flag-pkg-form label {
width: 10em;
diff --git a/templates/packages/details.html b/templates/packages/details.html
index f68aefa3..fd7bea4d 100644
--- a/templates/packages/details.html
+++ b/templates/packages/details.html
@@ -161,6 +161,11 @@
<th>Last Updated:</th>
<td>{{ pkg.last_update|date }}</td>
</tr>
+ {% if user.is_authenticated %}{% with pkg.flag_request as flag_request %}{% if flag_request %}<tr>
+ <th>Last Flag Request:</th>
+ <td>From {{ flag_request.who }} on {{ flag_request.created|date }}:<br/>
+ <div class="userdata">{{ flag_request.message|linebreaksbr|default:"{no message}" }}</div></td>
+ </tr>{% endif %}{% endwith %}{% endif %}
</table>
<div id="metadata">