summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
f81cf5f)
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
class DelegateFilter(Filter):
param = 'delegate'
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'
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
- if str == "*":
- self.applied = False
+ if str == self.no_delegate_key:
+ self.applied = True
self.delegate = None
return
self.delegate = None
return
def condition(self):
if self.delegate:
return self.delegate.get_profile().name()
def condition(self):
if self.delegate:
return self.delegate.get_profile().name()
+ return self.no_delegate_str
def _form(self):
delegates = User.objects.filter(userprofile__maintainer_projects =
def _form(self):
delegates = User.objects.filter(userprofile__maintainer_projects =
if not self.applied:
selected = 'selected'
if not self.applied:
selected = 'selected'
- str += '<option %s value="*">------</option>' % selected
+ str += '<option %s value="">------</option>' % selected
- if self.delegate is None:
+ if self.applied and self.delegate is None:
- 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 = ''
for d in delegates:
selected = ''
if self.delegate:
return self.delegate.id
if self.applied:
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:
def set_status(self, *args, **kwargs):
if 'delegate' in kwargs: