summaryrefslogtreecommitdiffstats
path: root/apps/patchwork/filters.py
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2008-09-12 10:41:27 +1000
committerJeremy Kerr <jk@ozlabs.org>2008-09-12 10:50:36 +1000
commite472cd43637c3b30b45ace46146addb46b8a5980 (patch)
tree422b0d02127ea113185b39d0a8993cdd48aaf8eb /apps/patchwork/filters.py
parentf81cf5f538934611bedb6ea6bfdabc31c764c7ea (diff)
downloadpatchwork-e472cd43637c3b30b45ace46146addb46b8a5980.tar.bz2
patchwork-e472cd43637c3b30b45ace46146addb46b8a5980.tar.xz
Don't apply delegate = Nobody filter by default
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'apps/patchwork/filters.py')
-rw-r--r--apps/patchwork/filters.py29
1 files changed, 11 insertions, 18 deletions
diff --git a/apps/patchwork/filters.py b/apps/patchwork/filters.py
index 4b29bc9..228c9c2 100644
--- a/apps/patchwork/filters.py
+++ b/apps/patchwork/filters.py
@@ -309,21 +309,19 @@ class ArchiveFilter(Filter):
class DelegateFilter(Filter):
param = 'delegate'
+ no_delegate_key = '-'
+ no_delegate_str = 'Nobody'
AnyDelegate = 1
def __init__(self, filters):
super(DelegateFilter, self).__init__(filters)
self.name = 'Delegate'
self.param = 'delegate'
-
- # default to applied, but no delegate - this will result in patches with
- # no delegate
self.delegate = None
- self.applied = True
def _set_key(self, str):
- if str == "*":
- self.applied = False
+ if str == self.no_delegate_key:
+ self.applied = True
self.delegate = None
return
@@ -342,7 +340,7 @@ class DelegateFilter(Filter):
def condition(self):
if self.delegate:
return self.delegate.get_profile().name()
- return 'Nobody'
+ return self.no_delegate_str
def _form(self):
delegates = User.objects.filter(userprofile__maintainer_projects =
@@ -354,13 +352,14 @@ class DelegateFilter(Filter):
if not self.applied:
selected = 'selected'
- str += '<option %s value="*">------</option>' % selected
+ str += '<option %s value="">------</option>' % selected
selected = ''
- if self.delegate is None:
+ if self.applied and self.delegate is None:
selected = 'selected'
- str += '<option %s value="">Nobody</option>' % selected
+ str += '<option %s value="%s">%s</option>' % \
+ (selected, self.no_delegate_key, self.no_delegate_str)
for d in delegates:
selected = ''
@@ -377,14 +376,8 @@ class DelegateFilter(Filter):
if self.delegate:
return self.delegate.id
if self.applied:
- return None
- return '*'
-
- def url_without_me(self):
- qs = self.filters.querystring_without_filter(self)
- if qs != '?':
- qs += '&'
- return qs + ('%s=*' % self.param)
+ return self.no_delegate_key
+ return None
def set_status(self, *args, **kwargs):
if 'delegate' in kwargs: