diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/admin.py | 4 | ||||
| -rw-r--r-- | packages/urls.py | 4 | ||||
| -rw-r--r-- | packages/urls_groups.py | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/packages/admin.py b/packages/admin.py index 4c170247..0589209f 100644 --- a/packages/admin.py +++ b/packages/admin.py @@ -10,9 +10,9 @@ class PackageRelationAdmin(admin.ModelAdmin): date_hierarchy = 'created' class FlagRequestAdmin(admin.ModelAdmin): - list_display = ('pkgbase', 'version', 'created', 'who', 'is_spam', + list_display = ('pkgbase', 'version', 'repo', 'created', 'who', 'is_spam', 'is_legitimate', 'message') - list_filter = ('is_spam', 'is_legitimate') + list_filter = ('is_spam', 'is_legitimate', 'repo') search_fields = ('pkgbase', 'user_email', 'message') ordering = ('-created',) date_hierarchy = 'created' diff --git a/packages/urls.py b/packages/urls.py index 1f25e3fd..6c616297 100644 --- a/packages/urls.py +++ b/packages/urls.py @@ -30,10 +30,10 @@ urlpatterns = patterns('packages.views', (r'^(?P<name>[A-z0-9\-+.]+)/$', 'details'), - (r'^(?P<repo>[A-z0-9\-]+)/(?P<name>[A-z0-9\-+.]+)/$', + (r'^(?P<repo>[A-z0-9\-]+)/(?P<name>[^ /]+)/$', 'details'), # canonical package url. subviews defined above - (r'^(?P<repo>[A-z0-9\-]+)/(?P<arch>[A-z0-9]+)/(?P<name>[A-z0-9\-+.]+)/', + (r'^(?P<repo>[A-z0-9\-]+)/(?P<arch>[A-z0-9]+)/(?P<name>[^ /]+)/', include(package_patterns)), ) diff --git a/packages/urls_groups.py b/packages/urls_groups.py index c561e50d..d609944b 100644 --- a/packages/urls_groups.py +++ b/packages/urls_groups.py @@ -3,7 +3,7 @@ from django.conf.urls.defaults import patterns urlpatterns = patterns('packages.views', (r'^$', 'groups', {}, 'groups-list'), (r'^(?P<arch>[A-z0-9]+)/$', 'groups'), - (r'^(?P<arch>[A-z0-9]+)/(?P<name>[A-z0-9\-+.]+)/$', 'group_details'), + (r'^(?P<arch>[A-z0-9]+)/(?P<name>[^ /]+)/$', 'group_details'), ) # vim: set ts=4 sw=4 et: |