def __init__(self, filters):
super(SubmitterFilter, self).__init__(filters)
self.name = 'Submitter'
- self.person = None
+ self.person = None
self.person_match = None
def _set_key(self, str):
return ''
def _form(self):
- name = ''
- if self.person:
- name = self.person.name
- return mark_safe(('<input onKeyUp="submitter_field_change(this)" ' +
- 'name="submitter" id="submitter_input" ' +
+ name = ''
+ if self.person:
+ name = self.person.name
+ return mark_safe(('<input onKeyUp="submitter_field_change(this)" ' +
+ 'name="submitter" id="submitter_input" ' +
'value="%s"> ' % escape(name)) +
- '<select id="submitter_select" ' +
- 'disabled="true"></select>')
+ '<select id="submitter_select" ' +
+ 'disabled="true"></select>')
def key(self):
if self.person:
class StateFilter(Filter):
param = 'state'
+ any_key = '*'
+ action_req_str = 'Action Required'
+
def __init__(self, filters):
super(StateFilter, self).__init__(filters)
self.name = 'State'
- self.state = None
+ self.state = None
+ self.applied = True
def _set_key(self, str):
+ self.state = None
+
+ if str == self.any_key:
+ self.applied = False
+ return
+
try:
self.state = State.objects.get(id=int(str))
except:
self.applied = True
def kwargs(self):
- return {'state': self.state}
+ if self.state is not None:
+ return {'state': self.state}
+ else:
+ return {'state__in': \
+ State.objects.filter(action_required = True) \
+ .values('pk').query}
def condition(self):
- return self.state.name
+ if self.state:
+ return self.state.name
+ return self.action_req_str
def key(self):
- if self.state is None:
- return None
- return self.state.id
+ if self.state is not None:
+ return self.state.id
+ if not self.applied:
+ return '*'
+ return None
def _form(self):
str = '<select name="%s">' % self.param
- str += '<option value="">any</option>'
+
+ selected = ''
+ if not self.applied:
+ selected = 'selected'
+ str += '<option %s value="%s">any</option>' % (selected, self.any_key)
+
+ selected = ''
+ if self.applied and self.state == None:
+ selected = 'selected'
+ str += '<option %s value="">%s</option>' % \
+ (selected, self.action_req_str)
+
for state in State.objects.all():
- selected = ''
+ selected = ''
if self.state and self.state == state:
- selected = ' selected="true"'
+ selected = ' selected="true"'
str += '<option value="%d" %s>%s</option>' % \
- (state.id, selected, state.name)
+ (state.id, selected, state.name)
str += '</select>'
return mark_safe(str);
def form_function(self):
return 'function(form) { return form.x.value }'
+ def url_without_me(self):
+ qs = self.filters.querystring_without_filter(self)
+ if qs != '?':
+ qs += '&'
+ return qs + '%s=%s' % (self.param, self.any_key)
+
class SearchFilter(Filter):
param = 'q'
def __init__(self, filters):
super(SearchFilter, self).__init__(filters)
self.name = 'Search'
self.param = 'q'
- self.search = None
+ self.search = None
def _set_key(self, str):
- str = str.strip()
- if str == '':
- return
+ str = str.strip()
+ if str == '':
+ return
self.search = str
self.applied = True
return self.search
def _form(self):
- value = ''
- if self.search:
- value = escape(self.search)
+ value = ''
+ if self.search:
+ value = escape(self.search)
return mark_safe('<input name="%s" value="%s">' %\
- (self.param, value))
+ (self.param, value))
def form_function(self):
return mark_safe('function(form) { return form.x.value }')
return self.description_map[self.archive_state]
def key(self):
- if self.archive_state == False:
- return None
- return self.param_map[self.archive_state]
+ if self.archive_state == False:
+ return None
+ return self.param_map[self.archive_state]
def _form(self):
s = ''
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
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 =
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 = ''
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 params(self):
return [ (f.param, f.key()) for f in self._filters \
- if f.key() is not None ]
+ if f.key() is not None ]
def querystring(self, remove = None):
params = dict(self.params())
for (k, v) in self.dict.iteritems():
if k not in params:
- params[k] = v[0]
+ params[k] = v
if remove is not None:
if remove.param in params.keys():