[views] Restructure profile view, simplify bundle access

[patchwork] / apps / patchwork / filters.py

diff --git a/apps/patchwork/filters.py b/apps/patchwork/filters.py
index 228c9c2ac2da2c21c8b88ce30ff70b3da297031d..77fc768dd485f3b6afbe3a2c0e5e9e42f5b1d946 100644 (file)
--- a/apps/patchwork/filters.py
+++ b/apps/patchwork/filters.py
@@ -188,8 +188,18 @@ class StateFilter(Filter):
 
     def _form(self):
         str = '<select name="%s">' % self.param
-        str += '<option value="%s">any</option>' % self.any_key
-        str += '<option value="">%s</option>' % self.action_req_str
+
+        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 = ''
             if self.state and self.state == state:
@@ -428,7 +438,7 @@ class Filters:
 
         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():