sample_set.py, all.html add current tag to search bar

In an attempt to make to more apparent that sample_sets have been
filtered by tag, we now display the tag in the filter search bar in a
way that will not impede any further searches performed by the user.

See #2619

server/web2py/applications/vidjil/controllers/sample_set.py

@@ -195,6 +195,9 @@ def all():
     if "filter" not in request.vars :
         request.vars["filter"] = ""
 
+    if "tag" not in request.vars:
+        request.vars["tag"] = ""
+
     result = helper.filter(request.vars['filter'], result)
     log.debug("%s list (%.3fs) %s" % (request.vars["type"], time.time()-start, request.vars["filter"]))
 

server/web2py/applications/vidjil/views/sample_set/all.html

@@ -8,7 +8,7 @@
 <div class="db_block">
     <div class="db_block_left">
         search
-        <input id="db_filter_input" type="text" value="{{=request.vars["filter"]}}"  onchange="db.call('sample_set/all', {'type': '{{=helper.get_type()}}', 'filter' : this.value} )">
+        <input id="db_filter_input" type="text" value="{{=request.vars["tag"] + " "}}{{=request.vars["filter"]}}"  onchange="db.call('sample_set/all', {'type': '{{=helper.get_type()}}', 'filter' : this.value} )">
     </div>
 </div>