diff options
Diffstat (limited to 'ishtar_common/static/js/ishtar.js')
| -rw-r--r-- | ishtar_common/static/js/ishtar.js | 45 |
1 files changed, 25 insertions, 20 deletions
diff --git a/ishtar_common/static/js/ishtar.js b/ishtar_common/static/js/ishtar.js index 43ef6ff1a..715ba85d5 100644 --- a/ishtar_common/static/js/ishtar.js +++ b/ishtar_common/static/js/ishtar.js @@ -655,29 +655,29 @@ function open_window(url){ } function save_and_close_window(name_label, name_pk, item_name, item_pk){ - var main_page = opener.document; - jQuery(main_page).find("#"+name_label).val(item_name); - jQuery(main_page).find("#"+name_pk).val(item_pk); - opener.focus(); - self.close(); + var main_page = opener.document; + jQuery(main_page).find("#"+name_label).val(item_name); + jQuery(main_page).find("#"+name_pk).val(item_pk); + opener.focus(); + self.close(); } function save_and_close_window_many(name_label, name_pk, item_name, item_pk){ - var main_page = opener.document; - var lbl_ = jQuery(main_page).find("#"+name_label); - var val_ = jQuery(main_page).find("#"+name_pk); - if (val_.val()){ - var v = lbl_.val(); - v = v.slice(0, v.lastIndexOf(",")); - lbl_.val(v + ", " + item_name + ", "); - val_.val(val_.val() + ", " + item_pk); - lbl_.change(); - } else { - jQuery(main_page).find("#"+name_label).val(item_name); - jQuery(main_page).find("#"+name_pk).val(item_pk); - } - opener.focus(); - self.close(); + var main_page = opener.document; + var lbl_ = jQuery(main_page).find("#" + name_label); + var val_ = jQuery(main_page).find("#" + name_pk); + if (val_.val()){ + var v = lbl_.val(); + v = v.slice(0, v.lastIndexOf(",")); + lbl_.val(v + ", " + item_name + ", "); + val_.val(val_.val() + ", " + item_pk); + lbl_.change(); + } else { + jQuery(main_page).find("#" + name_label).val(item_name); + jQuery(main_page).find("#" + name_pk).val(item_pk); + } + opener.focus(); + self.close(); } function multiRemoveItem(selItems, name, idx){ @@ -782,6 +782,11 @@ function update_search_field(){ } } else if ($(this).filter(":text").length){ v = $(this).val(); + if (v.match( new RegExp(' > ') )){ + matches = v.split(' > '); + v = matches[matches.length - 1]; + } + } else if ($(this).filter('input[type="number"]').length){ v = $(this).val(); } |