summaryrefslogtreecommitdiff
path: root/ishtar_common/static/js
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2018-07-12 16:59:26 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2018-08-13 18:26:03 +0200
commit5bd94ea3b1083607642afaf014d2663ce420febf (patch)
tree42f8348de4e1734026cda38d52a980e7d91cb5b8 /ishtar_common/static/js
parenta5593d66ea541dfbcd2597f81dcbc51965c51cfc (diff)
downloadIshtar-5bd94ea3b1083607642afaf014d2663ce420febf.tar.bz2
Ishtar-5bd94ea3b1083607642afaf014d2663ce420febf.zip
Fix bookmark load when item is pined - Fix extra space on criteria input - Fix enter submission for bookmarks
Diffstat (limited to 'ishtar_common/static/js')
-rw-r--r--ishtar_common/static/js/ishtar.js17
1 files changed, 7 insertions, 10 deletions
diff --git a/ishtar_common/static/js/ishtar.js b/ishtar_common/static/js/ishtar.js
index 60840bcf8..69b9b8477 100644
--- a/ishtar_common/static/js/ishtar.js
+++ b/ishtar_common/static/js/ishtar.js
@@ -44,6 +44,7 @@ var shortcut_url = '';
var alert_url = '';
var datatables_i18n;
var current_modal;
+var default_search_vector;
var datatables_default = {
"processing": true,
@@ -620,13 +621,10 @@ function clear_search_field(){
}
function update_search_field(){
- var base_query = $("#id_search_vector").val();
- if (base_query){
- base_query += " ";
- } else {
- base_query += "";
+ var query = $("#id_search_vector").val();
+ if (!query){
+ query = "";
}
- var query = "";
var inputs = $('#wizard-form input').map(
function(){
var v = "";
@@ -668,10 +666,9 @@ function update_search_field(){
}
);
document.getElementById('wizard-form').reset();
- base_query += query
- $("#id_search_vector").val(base_query);
- if (base_query){
- add_message(base_query, 'info', "#advanced-search-info", true, false);
+ $("#id_search_vector").val(query);
+ if (query){
+ add_message(query, 'info', "#advanced-search-info", true, false);
} else {
add_message("-", 'info', "#advanced-search-info", true, false);
}