Merge branch 'master' into v0.9

1 files changed, 19 insertions, 0 deletions

diff --git a/ishtar_common/templates/blocks/JQueryJqGrid.html b/ishtar_common/templates/blocks/JQueryJqGrid.html
index 607f81f7d..258082877 100644
--- a/ishtar_common/templates/blocks/JQueryJqGrid.html
+++ b/ishtar_common/templates/blocks/JQueryJqGrid.html
@@ -8,6 +8,12 @@
 
 <h4>{% trans "Search and select an item" %}</h4>
 
+<h5 id="pinned_search_{{name}}">
+    <i class="fa fa-thumb-tack"></i> &nbsp;
+    <strong>{% trans "Pinned search:" %}</strong>
+    <em><span id="pinned_search_content_{{name}}"></span></em>
+</h5>
+
 <table id='grid_{{name}}' class='jqgrid'></table>
 <div id='pager_{{name}}'></div>
 
@@ -97,6 +103,19 @@ jQuery(document).ready(function(){
     jsonReader : {repeatitems: false},
     loadError: function (jqXHR, textStatus, errorThrown) {
         alert("{% trans "An error as occured during search. Check your query fields." %}");
+    },
+    beforeProcessing: function(data, status, xhr){
+        $('#pinned_search_content_{{name}}').html('');
+        for (idx in data){
+            if (idx == 'pinned-search' && data[idx] != ''){
+               $('#pinned_search_content_{{name}}').html(data[idx]);
+            }
+        }
+        if ($('#pinned_search_content_{{name}}').html()){
+            $('#pinned_search_{{name}}').show();
+        } else {
+            $('#pinned_search_{{name}}').hide();
+        }
     }
   });
 {% if multiple %}