From bb570809f18c01a1172e970738bac6ac7b6171f1 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Thu, 26 Jan 2012 14:40:04 -0600
Subject: Add repo to flag request admin columns

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 packages/admin.py | 4 ++--
 1 file changed, 2 insertions(+), 2 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'
-- 
cgit v1.2.3-54-g00ecf


From d4ebdc5b974e9478b2cd41a6948d031c2222c5b4 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Sat, 28 Jan 2012 17:48:34 -0600
Subject: Support more characters in package names

Fixes FS#28106, where we couldn't view packages with names containing
the '@' symbol. Rather than whitelist things, switch to a blacklist of
only a space and slash character.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 packages/urls.py        | 4 ++--
 packages/urls_groups.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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 @@
 
     (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 @@
 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:
-- 
cgit v1.2.3-54-g00ecf