summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2018-09-19 13:53:17 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2018-09-19 13:53:17 +0200
commit8bf11f7cd69e8054aeb55430215bf062a2305ce6 (patch)
tree3f30680072f0fd4ed4b42f398d2fd97e13faa84f
parent670c5f4cb71c103bb2cac8e390b15cf44fa9ec83 (diff)
downloadIshtar-8bf11f7cd69e8054aeb55430215bf062a2305ce6.tar.bz2
Ishtar-8bf11f7cd69e8054aeb55430215bf062a2305ce6.zip
Fix inappropriate recopy in criteria search (refs #4243)
-rw-r--r--ishtar_common/static/js/ishtar.js4
-rw-r--r--version.py4
2 files changed, 5 insertions, 3 deletions
diff --git a/ishtar_common/static/js/ishtar.js b/ishtar_common/static/js/ishtar.js
index 936ce4f11..5812dfd40 100644
--- a/ishtar_common/static/js/ishtar.js
+++ b/ishtar_common/static/js/ishtar.js
@@ -655,7 +655,7 @@ function update_search_field(){
}
if (v == "") return;
var term = get_label_from_input(item_for_label);
- if(!term) return;
+ if(!term || typeof term == "undefined") return;
if (query) query += " ";
query += term + '="' + v + '"';
}
@@ -668,6 +668,8 @@ function update_search_field(){
if(item_for_label.filter('optgroup').length){
item_for_label = item_for_label.parent();
}
+ var term = get_label_from_input(item_for_label);
+ if(!term || typeof term == "undefined") return;
if (query) query += " ";
query += get_label_from_input(item_for_label) + '="' +
$(this).text() + '"';
diff --git a/version.py b/version.py
index c2583c3dd..d8d6d60ea 100644
--- a/version.py
+++ b/version.py
@@ -1,5 +1,5 @@
-# 2.1.dev.9
-VERSION = (2, 1, 'dev', 9)
+# 2.1.dev.10
+VERSION = (2, 1, 'dev', 10)
def get_version():