From 5888bdf0db3aaa38f35f4630af86edf4b07f65e2 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 24 Mar 2012 13:12:02 -0500 Subject: Use staticfiles_storage in jQuery tag To get the local URL to the jQuery JS file. Signed-off-by: Dan McGee --- main/templatetags/cdn.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'main') diff --git a/main/templatetags/cdn.py b/main/templatetags/cdn.py index f290a524..ab5d881a 100644 --- a/main/templatetags/cdn.py +++ b/main/templatetags/cdn.py @@ -1,8 +1,10 @@ from django import template from django.conf import settings +from django.contrib.staticfiles.storage import staticfiles_storage register = template.Library() + @register.simple_tag def jquery(): version = '1.4.4' @@ -11,8 +13,8 @@ def jquery(): link = 'https://ajax.googleapis.com/ajax/libs/jquery/' \ '%s/jquery.min.js' % version else: - static_url = getattr(settings, 'STATIC_URL', '/static/') - link = '%sjquery-%s.min.js' % (static_url, version) + filename = 'jquery-%s.min.js' % version + link = staticfiles_storage.url(filename) return '' % link # vim: set ts=4 sw=4 et: -- cgit v1.2.3-2-g168b From 48aec1534324ef17755a3edd2c379ff141c2b993 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 24 Mar 2012 17:10:22 -0500 Subject: Revert "Add some dev dashboard info regarding signed package count" This reverts commit 797185faed0555efb88a1e6a18e447548a9935fd. Now that all packages in the Arch repos are signed, this column isn't very useful as it just reflects the total package count. Conflicts: packages/views.py -> packages/views/search.py Signed-off-by: Dan McGee --- main/models.py | 4 ---- 1 file changed, 4 deletions(-) (limited to 'main') diff --git a/main/models.py b/main/models.py index 7d017242..289cbb84 100644 --- a/main/models.py +++ b/main/models.py @@ -74,10 +74,6 @@ class PackageManager(models.Manager): """Used by dev dashboard.""" return self.filter(flag_date__isnull=False) - def signed(self): - """Used by dev dashboard.""" - return self.filter(pgp_signature__isnull=False) - def normal(self): return self.select_related('arch', 'repo') -- cgit v1.2.3-2-g168b