X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=apps%2Fpatchwork%2Ffilters.py;fp=apps%2Fpatchwork%2Ffilters.py;h=6cd526ba6e7fede28598501378faa26ce0e6c1af;hb=05d26756d7e7f254d5631a0649aeac5fd3a58ca8;hp=f7fb6525c133b3fb878592e9dcd33034c2e8354e;hpb=04767c65175f2a76127cd78649c5d92a82a39bb6;p=patchwork diff --git a/apps/patchwork/filters.py b/apps/patchwork/filters.py index f7fb652..6cd526b 100644 --- a/apps/patchwork/filters.py +++ b/apps/patchwork/filters.py @@ -79,7 +79,7 @@ class SubmitterFilter(Filter): 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): @@ -127,14 +127,14 @@ class SubmitterFilter(Filter): return '' def _form(self): - name = '' - if self.person: - name = self.person.name - return mark_safe((' ' % escape(name)) + - '') + '') def key(self): if self.person: @@ -146,7 +146,7 @@ class StateFilter(Filter): def __init__(self, filters): super(StateFilter, self).__init__(filters) self.name = 'State' - self.state = None + self.state = None def _set_key(self, str): try: @@ -171,12 +171,12 @@ class StateFilter(Filter): str = '' return mark_safe(str); @@ -189,12 +189,12 @@ class SearchFilter(Filter): 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 @@ -208,11 +208,11 @@ class SearchFilter(Filter): 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('' %\ - (self.param, value)) + (self.param, value)) def form_function(self): return mark_safe('function(form) { return form.x.value }') @@ -253,9 +253,9 @@ class ArchiveFilter(Filter): 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 = '' @@ -402,7 +402,7 @@ class Filters: 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())