4 files changed, 28 insertions, 5 deletions
diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html
index 40e30706c..72c6a9b65 100644
--- a/ishtar_common/templates/base.html
+++ b/ishtar_common/templates/base.html
@@ -30,6 +30,7 @@
     {{EXTRA_JS|safe}}
     <script type='text/javascript'>
     var shortcut_url = '{% url "shortcut-menu" %}';
+    var alert_url = '{% url "alert-list" %}';
     var get_file_url = '{% url "get-file-shortcut" %}';
     var get_operation_url = '{% url "get-operation-shortcut" %}';
     var get_contextrecord_url = '{% url "get-contextrecord-shortcut" %}';
diff --git a/ishtar_common/templates/blocks/DataTables.html b/ishtar_common/templates/blocks/DataTables.html
index 0ae6ba7d0..c3ca16395 100644
--- a/ishtar_common/templates/blocks/DataTables.html
+++ b/ishtar_common/templates/blocks/DataTables.html
@@ -99,8 +99,9 @@ $('#modal_grid_{{name}}').on('hide.bs.modal', function (e) {
 
 var query_vars = new Array({{col_idx|safe}});
 var selItems_{{sname}} = new Array();
-jQuery(document).ready(function(){
-  jQuery("#search_{{name}}").click(function (){
+
+
+datatable_submit_search = function(){
     $("#id_search_vector").removeClass('input-progress');
     if ($('.modal-progress').length > 0){
         $('.modal-progress').modal('show');
@@ -137,11 +138,22 @@ jQuery(document).ready(function(){
         $('.modal-progress').modal('hide');
     }
     return false;
-  });
+};
+
+
+
+jQuery(document).ready(function(){
+  jQuery("#search_{{name}}").click(datatable_submit_search);
+
+  var base_source = "{{source}}";
+
+  if (default_search_vector){
+    base_source += "?search_vector=" + default_search_vector;
+  }
 
   datatable_options = {
     "ajax": {
-        "url": "{{source}}",
+        "url": base_source,
         "dataSrc": function (json) {
             manage_pinned_search("{{name}}", json);
             return json.rows;
diff --git a/ishtar_common/templates/ishtar/blocks/base_shortcut_menu.html b/ishtar_common/templates/ishtar/blocks/base_shortcut_menu.html
index 6faf37670..77ef9804b 100644
--- a/ishtar_common/templates/ishtar/blocks/base_shortcut_menu.html
+++ b/ishtar_common/templates/ishtar/blocks/base_shortcut_menu.html
@@ -8,7 +8,9 @@
     <span class="navbar-toggler-icon"></span>
 </button>
 {% endcomment %}
-<div class="navbar-collapse collapse justify-content-end">
+<div class="navbar-collapse collapse justify-content-between">
+    <span id="alert-list">
+    </span>
     <ul class="navbar-nav" id="navbar-shortcut">
       <li class="nav-item">
           <ol class="breadcrumb">
diff --git a/ishtar_common/templates/ishtar/wizard/search.html b/ishtar_common/templates/ishtar/wizard/search.html
index eebd58d89..a7a6faec7 100644
--- a/ishtar_common/templates/ishtar/wizard/search.html
+++ b/ishtar_common/templates/ishtar/wizard/search.html
@@ -5,6 +5,14 @@
 {% endblock %}
 {% block content %}
 <h3>{{wizard_label}}</h3>
+{% if default_search_vector %}
+<script type="text/javascript">
+    var default_search_vector = "{{default_search_vector|safe}}".replace(/''/g, '"');
+    $(document).ready(function() {
+        $("#id_search_vector").val(default_search_vector.replace(/''/g, '"'));
+    });
+</script>
+{% endif %}
 
 {% comment %}
 <nav aria-label="breadcrumb" role="navigation">