From 379fe756028528554510b3d0a760463daed8eb97 Mon Sep 17 00:00:00 2001
From: Luan <luanpab@gmail.com>
Date: Mon, 21 Oct 2013 14:54:55 -0200
Subject: [PATCH] Keeping value on filter inputs

---
 src/search/views.py              | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------
 src/templates/search/search.html |  6 +++---
 2 files changed, 75 insertions(+), 14 deletions(-)

diff --git a/src/search/views.py b/src/search/views.py
index fc7e16f..2210717 100644
--- a/src/search/views.py
+++ b/src/search/views.py
@@ -12,33 +12,94 @@ class ColabSearchView(SearchView):
             'wiki': {
                 'icon': 'file',
                 'name': _(u'Wiki'),
-                'fields': {'author': _(u'Author')},
+                'fields': (
+                    ('author', _(u'Author'), self.request.GET.get('author')),
+                ),
             },
             'thread': {
                 'icon': 'thread',
                 'name': _(u'Discussion'),
-                'fields': {'author': _(u'Author'), 'list': _(u'Mailinglist')},
+                'fields': (
+                    ('author', _(u'Author'), self.request.GET.get('author')),
+                    (
+                        'list',
+                        _(u'Mailinglist'),
+                        self.request.GET.getlist('list')
+                    ),
+                ),
             },
             'ticket': {
                 'icon': 'ticket',
                 'name': _(u'Ticket'),
-                'fields': {
-                    'milestone': _(u'Milestone'), 'priority': _(u'Priority'),
-                    'component': _(u'Component'), 'severity': _(u'Severity'),
-                    'reporter': _(u'Reporter'), 'author': _(u'Author'),
-                    'tag': _(u'Status'), 'keywords': _(u'Keywords'),
-                    'collaborators': _(u'Collaborators'),
-                },
+                'fields': (
+                    (
+                        'milestone',
+                        _(u'Milestone'),
+                        self.request.GET.get('milestone')
+                    ),
+                    (
+                        'priority',
+                        _(u'Priority'),
+                        self.request.GET.get('priority')
+                    ),
+                    (
+                        'component',
+                        _(u'Component'),
+                        self.request.GET.get('component')
+                    ),
+                    (
+                        'severity',
+                        _(u'Severity'),
+                        self.request.GET.get('severity')
+                    ),
+                    (
+                        'reporter',
+                        _(u'Reporter'),
+                        self.request.GET.get('reporter')
+                    ),
+                    ('author', _(u'Author'), self.request.GET.get('author')),
+                    ('tag', _(u'Status'), self.request.GET.get('tag')),
+                    (
+                        'keywords',
+                        _(u'Keywords'),
+                        self.request.GET.get('keywords'),
+                    ),
+                    (
+                        'collaborators',
+                        _(u'Collaborators'),
+                        self.request.GET.get('collaborators')
+                    ),
+                ),
             },
             'changeset': {
                 'icon': 'changeset',
                 'name': _(u'Changeset'),
-                'fields': {'author': _(u'Author'), 'repository_name': _(u'Repository')},
+                'fields': (
+                    ('author', _(u'Author'), self.request.GET.get('author')),
+                    (
+                        'repository_name',
+                        _(u'Repository'),
+                        self.request.GET.get('repository_name'),
+                    ),
+                )
             },
             'user': {
                 'icon': 'user',
                 'name': _(u'User'),
-                'fields': {'username': _(u'Username'), 'name': _(u'Name'), 'institution': _(u'Institution'), 'role': _(u'Role')},
+                'fields': (
+                    (
+                        'username',
+                        _(u'Username'),
+                        self.request.GET.get('username'),
+                    ),
+                    ('name', _(u'Name'), self.request.GET.get('name')),
+                    (
+                        'institution',
+                        _(u'Institution'),
+                        self.request.GET.get('institution'),
+                    ),
+                    ('role', _(u'Role'), self.request.GET.get('role'))
+                ),
             },
         }
 
diff --git a/src/templates/search/search.html b/src/templates/search/search.html
index 80cec8e..794e110 100644
--- a/src/templates/search/search.html
+++ b/src/templates/search/search.html
@@ -32,18 +32,18 @@
           <input type="hidden" name="q" value="{{ request.GET.q }}" />
           <input type="hidden" name="type" value="{{ type_chosen }}" />
 
-          {% for field_lookup, field_display in filters.fields.items %}
+          {% for field_lookup, field_display, field_value in filters.fields %}
             <div class="form-group">
               <label for="{{ field_lookup }}">{{ field_display }}</label>
               {% ifequal field_lookup "list" %}
                 <select name="{{ field_lookup }}" class="form-control" multiple>
                   {% for value, option in form.fields.list.choices %}
-                    <option value="{{ value }}">{{ option }}</option>
+                    <option value="{{ value }}" {% if value in field_value %}selected{% endif %}>{{ option }}</option>
                   {% endfor %}
                 </select>
               {% else %}
               <div class="input-group">
-                <input type="text" class="form-control" placeholder="{{ field_display }}" name="{{ field_lookup }}" value="">
+                <input type="text" class="form-control" placeholder="{{ field_display }}" name="{{ field_lookup }}" {% if field_value %}value="{{ field_value }}"{% endif %}>
               </div>
               {% endifequal %}
             </div>
--
libgit2 0.21.2