Show the correct selected player name in 'assets' view filters

Author: madcowfred

templates/thing/assets.html

@@ -46,19 +46,21 @@ <h2>Assets</h2>
           <form class="well well-small" action="{% url thing.views.assets %}" method="GET">
             <h4>Filters</h4>
             <fieldset>
-              <select name="filter_type">
-                <option value="char">Character</option>
+              {% for f_type, f_comp, f_value in filters %}
+              <select name="type">
+                <option value="char"{% if f_type == 'char' %} selected{% endif %}>Character</option>
               </select>
-              <select name="filter_comp" class="input-small">
-                <option value="eq">=</option>
-                <option value="ne">!=</option>
+              <select name="comp" class="input-small">
+                <option value="eq"{% if f_comp == 'eq' %} selected{% endif %}>=</option>
+                <option value="ne"{% if f_comp == 'ne' %} selected{% endif %}>!=</option>
               </select>
-              <select name="filter_value">
+              <select name="value">
                 <option value=""></option>
                 {% for character in characters %}
-                <option value="{{ character.eve_character_id }}">{{ character.name }}</option>
+                <option value="{{ character.eve_character_id }}"{% if f_value == character.eve_character_id %} selected{% endif %}>{{ character.name }}</option>
                 {% endfor %}
               </select>
+              {% endfor %}
             </fieldset>
             {% comment %}<button id="add-filter" class="btn btn-primary"><i class="icon-plus icon-white"></i> Add filter</button>{% endcomment %}
             <button type="submit" class="btn btn-primary">Apply filters</button>

thing/views.py

@@ -274,23 +274,30 @@ def assets(request):
     assets = CharacterAsset.objects.select_related('system', 'station', 'item__item_group__category', 'character', 'inv_flag').filter(character__apikey__user=request.user)
 
     # retrieve any supplied filter values
-    filter_types = request.GET.getlist('filter_type')
-    filter_comps = request.GET.getlist('filter_comp')
-    filter_values = request.GET.getlist('filter_value')
+    f_types = request.GET.getlist('type')
+    f_comps = request.GET.getlist('comp')
+    f_values = request.GET.getlist('value')
 
     # check lengths
-    if len(filter_types) == len(filter_comps) and len(filter_types) == len(filter_values):
-        for i in range(len(filter_types)):
-            ft = filter_types[i]
-            fc = filter_comps[i]
-            fv = filter_values[i]
+    filters = []
+
+    if len(f_types) == len(f_comps) and len(f_types) == len(f_values):
+        for i in range(len(f_types)):
+            ft = f_types[i]
+            fc = f_comps[i]
+            fv = f_values[i]
 
             if ft == 'char' and fv.isdigit():
                 if fc == 'eq':
                     assets = assets.filter(character_id=fv)
                 elif fc == 'ne':
                     assets = assets.exclude(character_id=fv)
 
+                filters.append((ft, fc, int(fv)))
+
+    if not filters:
+        filters.append(('char', 'eq', 0))
+
     # initialise data structures
     ca_lookup = {}
     loc_totals = {}
@@ -355,6 +362,7 @@ def assets(request):
         'thing/assets.html',
         {
             'characters': Character.objects.filter(apikey__user=request.user),
+            'filters': filters,
             'total_value': total_value,
             'systems': sorted_systems,
             'loc_totals': loc_totals,