diff --git a/epdb/models.py b/epdb/models.py index 88ed9855..a6d4cee1 100644 --- a/epdb/models.py +++ b/epdb/models.py @@ -944,7 +944,7 @@ class SimpleAmbitRule(SimpleRule): @property def as_svg(self): - return IndigoUtils.smirks_to_svg(self.smirks, True) + return IndigoUtils.smirks_to_svg(self.smirks, True, width=800, height=400) class SimpleRDKitRule(SimpleRule): @@ -1203,6 +1203,12 @@ class Pathway(EnviPathModel, AliasMixin, ScenarioMixin): for n in self.root_nodes: queue.append(n) + # Add unconnected nodes + for n in self.nodes: + if len(n.out_edges.all()) == 0: + if n not in queue: + queue.append(n) + while len(queue): current = queue.pop() processed.add(current) @@ -1341,12 +1347,12 @@ class Pathway(EnviPathModel, AliasMixin, ScenarioMixin): pw = Pathway() pw.package = package - if name is None: + if name is None or name.strip() == '': name = f"Pathway {Pathway.objects.filter(package=package).count() + 1}" pw.name = name - if description is not None: + if description is not None and description.strip() != '': pw.description = description pw.save() diff --git a/epdb/views.py b/epdb/views.py index ab9d4b7d..453eb397 100644 --- a/epdb/views.py +++ b/epdb/views.py @@ -4,6 +4,9 @@ from typing import List, Dict, Any from django.conf import settings as s from django.contrib.auth import get_user_model +from django.db.models import F, Value +from django.db.models.fields import CharField +from django.db.models.functions import Concat from django.http import JsonResponse, HttpResponse, HttpResponseNotAllowed, HttpResponseBadRequest from django.shortcuts import render, redirect from django.views.decorators.csrf import csrf_exempt @@ -436,8 +439,16 @@ def scenarios(request): if request.GET.get('all'): return JsonResponse({ "objects": [ - {"name": pw.name, "url": pw.url, "reviewed": True} - for pw in reviewed_scenario_qs + {"name": s.name, "url": s.full_url, "reviewed": True} + for s in reviewed_scenario_qs.annotate( + full_url=Concat( + Value(s.SERVER_URL + '/package/'), + F("package__uuid"), + Value("/scenario/"), + F("uuid"), + output_field=CharField(), + ) + ) ] }) @@ -517,6 +528,7 @@ def search(request): packages = PackageManager.get_reviewed_packages() search_result = SearchManager.search(packages, searchterm, mode) + return JsonResponse(search_result, safe=False) context = get_base_context(request) @@ -542,6 +554,7 @@ def search(request): packages = PackageManager.get_reviewed_packages() context['search_result'] = SearchManager.search(packages, searchterm, mode) + context['search_result']['searchterm'] = searchterm return render(request, 'search.html', context) @@ -706,7 +719,7 @@ def package_model(request, package_uuid, model_uuid): elif request.method == 'POST': if hidden := request.POST.get('hidden', None): - if hidden == 'delete-model': + if hidden == 'delete': current_model.delete() return redirect(current_package.url + '/model') else: @@ -757,7 +770,7 @@ def package(request, package_uuid): logger.debug(f"{k}\t{v}") if hidden := request.POST.get('hidden', None): - if hidden == 'delete-package': + if hidden == 'delete': logger.debug(current_package.delete()) return redirect(s.SERVER_URL + '/package') else: @@ -897,7 +910,7 @@ def package_compound(request, package_uuid, compound_uuid): elif request.method == 'POST': if hidden := request.POST.get('hidden', None): - if hidden == 'delete-compound': + if hidden == 'delete': current_compound.delete() return redirect(current_package.url + '/compound') else: @@ -940,6 +953,7 @@ def package_compound_structures(request, package_uuid, compound_uuid): context['meta']['current_package'] = current_package context['object_type'] = 'structure' + context['breadcrumbs'] = breadcrumbs(current_package, 'compound', current_compound, 'structure') reviewed_compound_structure_qs = CompoundStructure.objects.none() unreviewed_compound_structure_qs = CompoundStructure.objects.none() @@ -979,15 +993,38 @@ def package_compound_structure(request, package_uuid, compound_uuid, structure_u context['title'] = f'enviPath - {current_package.name} - {current_compound.name} - {current_structure.name}' context['meta']['current_package'] = current_package - context['object_type'] = 'compound' + context['object_type'] = 'structure' context['compound_structure'] = current_structure context['current_object'] = current_structure + context['breadcrumbs'] = breadcrumbs(current_package, 'compound', current_compound, 'structure', current_structure) return render(request, 'objects/compound_structure.html', context) elif request.method == 'POST': + if hidden := request.POST.get('hidden', None): + if hidden == 'delete': + # Check if we have to delete the compound as no structure is left + if len(current_structure.compound.structures.all()) == 1: + # This will delete the structure as well + current_compound.delete() + return redirect(current_package.url + '/compound') + else: + if current_structure.normalized_structure: + current_compound.delete() + return redirect(current_package.url + '/compound') + else: + if current_compound.default_structure == current_structure: + current_structure.delete() + current_compound.default_structure = current_compound.structures.all().first() + return redirect(current_compound.url + '/structure') + else: + current_structure.delete() + return redirect(current_compound.url + '/structure') + else: + return HttpResponseBadRequest() + selected_scenarios = request.POST.getlist('selected-scenarios') if selected_scenarios: @@ -1109,7 +1146,7 @@ def package_rule(request, package_uuid, rule_uuid): elif request.method == 'POST': if hidden := request.POST.get('hidden', None): - if hidden == 'delete-rule': + if hidden == 'delete': current_rule.delete() return redirect(current_package.url + '/rule') else: @@ -1212,7 +1249,7 @@ def package_reaction(request, package_uuid, reaction_uuid): elif request.method == 'POST': if hidden := request.POST.get('hidden', None): - if hidden == 'delete-reaction': + if hidden == 'delete': current_reaction.delete() return redirect(current_package.url + '/reaction') else: @@ -1281,8 +1318,8 @@ def package_pathways(request, package_uuid): log_post_params(request) - name = request.POST.get('name', 'Pathway ' + str(Pathway.objects.filter(package=current_package).count())) - description = request.POST.get('description', s.DEFAULT_VALUES['description']) + name = request.POST.get('name') + description = request.POST.get('description') pw_mode = request.POST.get('predict', 'predict') smiles = request.POST.get('smiles') @@ -1303,7 +1340,14 @@ def package_pathways(request, package_uuid): return error(request, "Pathway prediction failed!", f'Pathway prediction failed as received mode "{pw_mode}" is none of {modes}') + prediction_setting = request.POST.get('prediction-setting', None) + if prediction_setting: + prediction_setting = SettingManager.get_setting_by_url(current_user, prediction_setting) + else: + prediction_setting = current_user.prediction_settings() + pw = Pathway.create(current_package, stand_smiles, name=name, description=description) + # set mode pw.kv.update({'mode': pw_mode}) pw.save() @@ -1316,12 +1360,11 @@ def package_pathways(request, package_uuid): if pw_mode == 'incremental': limit = 1 - pred_setting = current_user.prediction_settings() - pw.setting = pred_setting + pw.setting = prediction_setting pw.save() from .tasks import predict - predict.delay(pw.pk, pred_setting.pk, limit=limit) + predict.delay(pw.pk, prediction_setting.pk, limit=limit) return redirect(pw.url) @@ -1371,7 +1414,7 @@ def package_pathway(request, package_uuid, pathway_uuid): elif request.method == 'POST': if hidden := request.POST.get('hidden', None): - if hidden == 'delete-pathway': + if hidden == 'delete': current_pathway.delete() return redirect(current_package.url + '/pathway') else: @@ -1514,7 +1557,7 @@ def package_pathway_node(request, package_uuid, pathway_uuid, node_uuid): log_post_params(request) if hidden := request.POST.get('hidden', None): - if hidden == 'delete-node': + if hidden == 'delete': # pre_delete signal will take care of edge deletion current_node.delete() @@ -1616,7 +1659,7 @@ def package_pathway_edge(request, package_uuid, pathway_uuid, edge_uuid): 'title'] = f'enviPath - {current_package.name} - {current_pathway.name} - {current_edge.edge_label.name}' context['meta']['current_package'] = current_package - context['object_type'] = 'reaction' + context['object_type'] = 'edge' context['breadcrumbs'] = breadcrumbs(current_package, 'pathway', current_pathway, 'edge', current_edge) context['edge'] = current_edge context['current_object'] = current_edge @@ -1628,7 +1671,7 @@ def package_pathway_edge(request, package_uuid, pathway_uuid, edge_uuid): log_post_params(request) if hidden := request.POST.get('hidden', None): - if hidden == 'delete-edge': + if hidden == 'delete': current_edge.delete() return redirect(current_pathway.url) @@ -1896,7 +1939,7 @@ def group(request, group_uuid): log_post_params(request) if hidden := request.POST.get('hidden', None): - if hidden == 'delete-group': + if hidden == 'delete': current_group.delete() return redirect(s.SERVER_URL + '/group') else: diff --git a/templates/actions/objects/compound.html b/templates/actions/objects/compound.html index 77cfb4cd..88ecb27c 100644 --- a/templates/actions/objects/compound.html +++ b/templates/actions/objects/compound.html @@ -12,7 +12,7 @@ Set Scenarios
  • - + Delete Compound
    • {% endif %} \ No newline at end of file diff --git a/templates/actions/objects/compound_structure.html b/templates/actions/objects/compound_structure.html index 9ca6bbe1..fa97c298 100644 --- a/templates/actions/objects/compound_structure.html +++ b/templates/actions/objects/compound_structure.html @@ -8,7 +8,7 @@ Set Scenarios
  • - + Delete Compound Structure
    • {% endif %} \ No newline at end of file diff --git a/templates/actions/objects/edge.html b/templates/actions/objects/edge.html new file mode 100644 index 00000000..49642fcc --- /dev/null +++ b/templates/actions/objects/edge.html @@ -0,0 +1,10 @@ +{% if meta.can_edit %} +
  • + + Set Scenarios +
    • +
  • + + Delete Edge +
    • +{% endif %} diff --git a/templates/actions/objects/group.html b/templates/actions/objects/group.html index fb941c90..b7fdbeb3 100644 --- a/templates/actions/objects/group.html +++ b/templates/actions/objects/group.html @@ -1,10 +1,10 @@ {% if meta.can_edit %}
  • - - Delete Group -
    • -
  • - + Add/Remove Member
    • +
  • + + Delete Group +
    • {% endif %} \ No newline at end of file diff --git a/templates/actions/objects/model.html b/templates/actions/objects/model.html index 1047618c..466bcc66 100644 --- a/templates/actions/objects/model.html +++ b/templates/actions/objects/model.html @@ -1,6 +1,6 @@ {% if meta.can_edit %}
  • - + Delete Model
    • {% endif %} \ No newline at end of file diff --git a/templates/actions/objects/node.html b/templates/actions/objects/node.html index ba0481b8..487c1435 100644 --- a/templates/actions/objects/node.html +++ b/templates/actions/objects/node.html @@ -8,7 +8,7 @@ Set Scenarios
  • - + Delete Node
    • {% endif %} diff --git a/templates/actions/objects/package.html b/templates/actions/objects/package.html index 7ebaabb1..d0aa5394 100644 --- a/templates/actions/objects/package.html +++ b/templates/actions/objects/package.html @@ -12,7 +12,7 @@ License
  • - + Delete Package
    • {% endif %} \ No newline at end of file diff --git a/templates/actions/objects/pathway.html b/templates/actions/objects/pathway.html index 4b1f92ad..78b36ea3 100644 --- a/templates/actions/objects/pathway.html +++ b/templates/actions/objects/pathway.html @@ -35,7 +35,7 @@ Delete Reaction
  • - + Delete Pathway
    • {% endif %} \ No newline at end of file diff --git a/templates/actions/objects/reaction.html b/templates/actions/objects/reaction.html index fb72b608..3578e881 100644 --- a/templates/actions/objects/reaction.html +++ b/templates/actions/objects/reaction.html @@ -8,7 +8,7 @@ Set Scenarios
  • - + Delete Reaction
    • {% endif %} \ No newline at end of file diff --git a/templates/actions/objects/rule.html b/templates/actions/objects/rule.html index 69d4a780..3e37ea68 100644 --- a/templates/actions/objects/rule.html +++ b/templates/actions/objects/rule.html @@ -8,7 +8,7 @@ Set Scenarios
  • - + Delete Rule
    • {% endif %} \ No newline at end of file diff --git a/templates/actions/objects/user.html b/templates/actions/objects/user.html index 99d7f45a..e1d832f1 100644 --- a/templates/actions/objects/user.html +++ b/templates/actions/objects/user.html @@ -16,7 +16,7 @@ {# Manage API Token#} {# #}
  • - + Delete Account
    • {% endif %} \ No newline at end of file diff --git a/templates/framework.html b/templates/framework.html index 0f83ef1b..1a7ff474 100644 --- a/templates/framework.html +++ b/templates/framework.html @@ -83,21 +83,26 @@ diff --git a/templates/index/index.html b/templates/index/index.html index 8a9075d6..1390fcf7 100644 --- a/templates/index/index.html +++ b/templates/index/index.html @@ -143,6 +143,14 @@ } $(function () { + + $('#index-form').on("keydown", function (e) { + if (e.key === "Enter") { + e.preventDefault(); + goButtonClicked(); + } + }); + // Code that should be executed once DOM is ready goes here $('#dropdown-predict').on('click', actionDropdownClicked); $('#dropdown-search').on('click', actionDropdownClicked); diff --git a/templates/modals/objects/delete_compound_modal.html b/templates/modals/objects/delete_compound_modal.html deleted file mode 100644 index ddeba5e5..00000000 --- a/templates/modals/objects/delete_compound_modal.html +++ /dev/null @@ -1,35 +0,0 @@ -{% load static %} - - - diff --git a/templates/modals/objects/delete_group_modal.html b/templates/modals/objects/delete_group_modal.html deleted file mode 100644 index 057fab2f..00000000 --- a/templates/modals/objects/delete_group_modal.html +++ /dev/null @@ -1,38 +0,0 @@ -{% load static %} - - - diff --git a/templates/modals/objects/delete_model_modal.html b/templates/modals/objects/delete_model_modal.html deleted file mode 100644 index 053dcece..00000000 --- a/templates/modals/objects/delete_model_modal.html +++ /dev/null @@ -1,35 +0,0 @@ -{% load static %} - - - diff --git a/templates/modals/objects/delete_node_modal.html b/templates/modals/objects/delete_node_modal.html deleted file mode 100644 index f014ac9b..00000000 --- a/templates/modals/objects/delete_node_modal.html +++ /dev/null @@ -1,35 +0,0 @@ -{% load static %} - - - diff --git a/templates/modals/objects/delete_package_modal.html b/templates/modals/objects/delete_package_modal.html deleted file mode 100644 index 4cd34020..00000000 --- a/templates/modals/objects/delete_package_modal.html +++ /dev/null @@ -1,36 +0,0 @@ -{% load static %} - - - diff --git a/templates/modals/objects/delete_pathway_edge_modal.html b/templates/modals/objects/delete_pathway_edge_modal.html index 1de8ed26..acc52be3 100644 --- a/templates/modals/objects/delete_pathway_edge_modal.html +++ b/templates/modals/objects/delete_pathway_edge_modal.html @@ -22,7 +22,7 @@ {% endfor %} - +

    diff --git a/templates/modals/objects/delete_pathway_modal.html b/templates/modals/objects/delete_pathway_modal.html deleted file mode 100644 index a91041a6..00000000 --- a/templates/modals/objects/delete_pathway_modal.html +++ /dev/null @@ -1,35 +0,0 @@ -{% load static %} - - - diff --git a/templates/modals/objects/delete_pathway_node_modal.html b/templates/modals/objects/delete_pathway_node_modal.html index 65606f49..0b844d8a 100644 --- a/templates/modals/objects/delete_pathway_node_modal.html +++ b/templates/modals/objects/delete_pathway_node_modal.html @@ -22,7 +22,7 @@ {% endfor %} - +

    diff --git a/templates/modals/objects/delete_reaction_modal.html b/templates/modals/objects/delete_reaction_modal.html deleted file mode 100644 index 139ba829..00000000 --- a/templates/modals/objects/delete_reaction_modal.html +++ /dev/null @@ -1,35 +0,0 @@ -{% load static %} - - - diff --git a/templates/modals/objects/delete_user_modal.html b/templates/modals/objects/delete_user_modal.html deleted file mode 100644 index 9fbba358..00000000 --- a/templates/modals/objects/delete_user_modal.html +++ /dev/null @@ -1,38 +0,0 @@ -{% load static %} - - - diff --git a/templates/modals/objects/download_pathway_modal.html b/templates/modals/objects/download_pathway_modal.html index eefc58d0..e9a89f88 100644 --- a/templates/modals/objects/download_pathway_modal.html +++ b/templates/modals/objects/download_pathway_modal.html @@ -29,6 +29,7 @@ $('#download-pathway-modal-submit').click(function (e) { e.preventDefault(); $('#download-pathway-modal-form').submit(); + $('#download_pathway_modal').modal('hide'); }); }) diff --git a/templates/modals/objects/generic_delete_modal.html b/templates/modals/objects/generic_delete_modal.html new file mode 100644 index 00000000..f499959b --- /dev/null +++ b/templates/modals/objects/generic_delete_modal.html @@ -0,0 +1,42 @@ +{% load static %} + + + diff --git a/templates/modals/predict_modal.html b/templates/modals/predict_modal.html index 398b165e..8d806342 100644 --- a/templates/modals/predict_modal.html +++ b/templates/modals/predict_modal.html @@ -49,6 +49,18 @@ + + + +
    diff --git a/templates/objects/composite_rule.html b/templates/objects/composite_rule.html index 5a6de778..c0bb5ccb 100644 --- a/templates/objects/composite_rule.html +++ b/templates/objects/composite_rule.html @@ -5,6 +5,7 @@ {% block action_modals %} {% include "modals/objects/edit_rule_modal.html" %} {% include "modals/objects/generic_set_scenario_modal.html" %} +{% include "modals/objects/generic_delete_modal.html" %} {% endblock action_modals %}
    diff --git a/templates/objects/compound.html b/templates/objects/compound.html index d7565e4d..80994163 100644 --- a/templates/objects/compound.html +++ b/templates/objects/compound.html @@ -6,7 +6,7 @@ {% include "modals/objects/edit_compound_modal.html" %} {% include "modals/objects/add_structure_modal.html" %} {% include "modals/objects/generic_set_scenario_modal.html" %} - {% include "modals/objects/delete_compound_modal.html" %} + {% include "modals/objects/generic_delete_modal.html" %} {% endblock action_modals %}
    diff --git a/templates/objects/compound_structure.html b/templates/objects/compound_structure.html index bbf050a0..d86bb33b 100644 --- a/templates/objects/compound_structure.html +++ b/templates/objects/compound_structure.html @@ -5,6 +5,7 @@ {% block action_modals %} {% include "modals/objects/edit_compound_structure_modal.html" %} {% include "modals/objects/generic_set_scenario_modal.html" %} +{% include "modals/objects/generic_delete_modal.html" %} {% endblock action_modals %}
    diff --git a/templates/objects/edge.html b/templates/objects/edge.html index cb1db12d..6e2a80dc 100644 --- a/templates/objects/edge.html +++ b/templates/objects/edge.html @@ -4,8 +4,8 @@ {% block action_modals %} {# {% include "modals/objects/edit_edge_modal.html" %}#} -{# {% include "modals/objects/delete_edge_modal.html" %}#} - {% include "modals/objects/generic_set_scenario_modal.html" %} + {% include "modals/objects/generic_set_scenario_modal.html" %} + {% include "modals/objects/generic_delete_modal.html" %} {% endblock action_modals %}
    @@ -20,7 +20,7 @@ style="padding-right:1em">
    diff --git a/templates/objects/group.html b/templates/objects/group.html index a27aca6d..dc97057f 100644 --- a/templates/objects/group.html +++ b/templates/objects/group.html @@ -5,7 +5,7 @@ {% block action_modals %} {% include "modals/objects/edit_group_modal.html" %} {% include "modals/objects/edit_group_member_modal.html" %} -{% include "modals/objects/delete_group_modal.html" %} +{% include "modals/objects/generic_delete_modal.html" %} {% endblock action_modals %}
    diff --git a/templates/objects/model.html b/templates/objects/model.html index f8d2d484..c23f477e 100644 --- a/templates/objects/model.html +++ b/templates/objects/model.html @@ -4,7 +4,7 @@ {% block content %} {% block action_modals %} - {% include "modals/objects/delete_model_modal.html" %} + {% include "modals/objects/generic_delete_modal.html" %} {% endblock action_modals %} diff --git a/templates/objects/node.html b/templates/objects/node.html index 0e305074..bc4ceee1 100644 --- a/templates/objects/node.html +++ b/templates/objects/node.html @@ -5,7 +5,7 @@ {% block action_modals %} {% include "modals/objects/edit_node_modal.html" %} {% include "modals/objects/generic_set_scenario_modal.html" %} - {% include "modals/objects/delete_node_modal.html" %} + {% include "modals/objects/generic_delete_modal.html" %} {% endblock action_modals %}
    diff --git a/templates/objects/package.html b/templates/objects/package.html index 419f5cda..90d1eb02 100644 --- a/templates/objects/package.html +++ b/templates/objects/package.html @@ -6,7 +6,7 @@ {% include "modals/objects/edit_package_modal.html" %} {% include "modals/objects/edit_package_permissions_modal.html" %} {% include "modals/objects/set_license_modal.html" %} - {% include "modals/objects/delete_package_modal.html" %} + {% include "modals/objects/generic_delete_modal.html" %} {% endblock action_modals %}
    @@ -52,23 +52,5 @@
    - {% if package.license %} -

    -
    -
    -
    - License -
    -
    -
    -
    - - - -
    -
    -
    - {% endif %} -
    {% endblock content %} diff --git a/templates/objects/pathway.html b/templates/objects/pathway.html index e4e9e3af..38ccd6fe 100644 --- a/templates/objects/pathway.html +++ b/templates/objects/pathway.html @@ -86,7 +86,7 @@ {% include "modals/objects/generic_set_scenario_modal.html" %} {% include "modals/objects/delete_pathway_node_modal.html" %} {% include "modals/objects/delete_pathway_edge_modal.html" %} - {% include "modals/objects/delete_pathway_modal.html" %} + {% include "modals/objects/generic_delete_modal.html" %} {% endblock action_modals %}

    diff --git a/templates/objects/reaction.html b/templates/objects/reaction.html index 59483443..bf128497 100644 --- a/templates/objects/reaction.html +++ b/templates/objects/reaction.html @@ -5,7 +5,7 @@ {% block action_modals %} {% include "modals/objects/edit_reaction_modal.html" %} {% include "modals/objects/generic_set_scenario_modal.html" %} - {% include "modals/objects/delete_reaction_modal.html" %} + {% include "modals/objects/generic_delete_modal.html" %} {% endblock action_modals %}
    diff --git a/templates/objects/scenario.html b/templates/objects/scenario.html index 008e4b45..c7929540 100644 --- a/templates/objects/scenario.html +++ b/templates/objects/scenario.html @@ -3,7 +3,7 @@ {% block content %} {% block action_modals %} - + {% include "modals/objects/generic_delete_modal.html" %} {% endblock action_modals %}
    diff --git a/templates/objects/simple_rule.html b/templates/objects/simple_rule.html index 28c2f00c..72916a73 100644 --- a/templates/objects/simple_rule.html +++ b/templates/objects/simple_rule.html @@ -5,6 +5,7 @@ {% block action_modals %} {% include "modals/objects/edit_rule_modal.html" %} {% include "modals/objects/generic_set_scenario_modal.html" %} + {% include "modals/objects/generic_delete_modal.html" %} {% endblock action_modals %}
    diff --git a/templates/objects/user.html b/templates/objects/user.html index 0f533904..1e67898d 100644 --- a/templates/objects/user.html +++ b/templates/objects/user.html @@ -7,7 +7,7 @@ {% include "modals/objects/edit_password_modal.html" %} {% include "modals/collections/new_prediction_setting_modal.html" %} {% include "modals/objects/manage_api_token_modal.html" %} -{% include "modals/objects/delete_user_modal.html" %} +{% include "modals/objects/generic_delete_modal.html" %} {% endblock action_modals %}
    diff --git a/templates/search.html b/templates/search.html index 1f99dbe9..47ea336b 100644 --- a/templates/search.html +++ b/templates/search.html @@ -79,6 +79,10 @@ allEmpty = true; for (key in data) { + if (key === 'searchterm') { + continue; + } + if (data[key].length < 1) { continue; } @@ -176,8 +180,16 @@ $("#selPackages").selectpicker(); $("#search-button").on("click", search); + $("#searchbar").on("keydown", function (e) { + if (e.key === "Enter") { + e.preventDefault(); + search(e); + } + }); + }); {% if search_result %} + $('#searchbar').val('{{ search_result.searchterm }}') handleSearchResponse("results", {{ search_result|safe }}); {% endif %}