Merge branch 'clenk' into celery

mitre · Sep 8, 2017 · 8f2d7cb · 8f2d7cb
2 parents d2e7fb9 + ceef8f1
commit 8f2d7cb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/web/app.py b/web/app.py
@@ -63,7 +63,7 @@ def tasks():
 
 @app.route('/report/<int:task_id>', methods=['GET'])
 def reports(task_id=1):
-    term = re.escape(request.args.get('st', None))
+    term = re.escape(request.args.get('st', ''))
 
     return render_template('report.html', task_id=task_id,
                            api_loc=app.config['API_LOC'], search_term=term)

diff --git a/web/templates/report.html b/web/templates/report.html
@@ -20,6 +20,11 @@
       else {
         shouldExpand = (parentSize < 10 && numberRowsInContent < 10);
       }
+      {% if search_term %}
+      if (!shouldExpand && content.indexOf('{{ search_term }}') >= 0) {
+          shouldExpand = true;
+      }
+      {% endif %}
 
       if (shouldExpand) {
         expanderStyle = 'style="display: none;"'
@@ -233,6 +238,11 @@
           .attr("data-placement", "left")
           .tooltip();
       })
+
+      {% if search_term %}
+      // Scroll to highlighted search term
+      $('html, body'). scrollTop($('.highlight').first().offset().top);
+      {% endif %}
     });
   }