diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-12-12 19:16:13 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-12-12 19:16:13 -0500 |
| commit | cdfa6c1195bb6feb812bffc981183f0758ca5e2f (patch) | |
| tree | d06b43424ad16f905fac7f2af54fec3fbc428e5f /main | |
| parent | 4b700666e3405b8dc1891dd7e156b233333c7912 (diff) | |
| parent | fd1c992472ea259111a2f4930b73a805c07ee068 (diff) | |
Merge tag 'release_2012-03-25'
Django 1.4 upgrade and a bunch of other stuff
Diffstat (limited to 'main')
| -rw-r--r-- | main/models.py | 4 | ||||
| -rw-r--r-- | main/templatetags/cdn.py | 6 |
2 files changed, 4 insertions, 6 deletions
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') 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 '<script type="text/javascript" src="%s"></script>' % link # vim: set ts=4 sw=4 et: |