From efd5bacc7a634abac574f6eab0daa2375c485535 Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Tue, 8 May 2012 18:02:56 +0000 Subject: [PATCH] Make sure value gets set before applying filters, or it won't stay --- etemplate/js/et2_extension_nextmatch.js | 3 +++ etemplate/js/et2_widget_selectbox.js | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/etemplate/js/et2_extension_nextmatch.js b/etemplate/js/et2_extension_nextmatch.js index a2e1798325..86b9e43dbd 100644 --- a/etemplate/js/et2_extension_nextmatch.js +++ b/etemplate/js/et2_extension_nextmatch.js @@ -1454,6 +1454,9 @@ var et2_nextmatch_filterheader = et2_selectbox.extend(et2_INextmatchHeader, { { delete (event.data.nextmatch.activeFilters["col_filter"][event.data.id]); } + // Set value so it's there for response (otherwise it gets cleared if options are updated) + event.data.set_value(event.data.input.val()); + event.data.nextmatch.applyFilters(); }); diff --git a/etemplate/js/et2_widget_selectbox.js b/etemplate/js/et2_widget_selectbox.js index 084c574ec1..109568e09a 100644 --- a/etemplate/js/et2_widget_selectbox.js +++ b/etemplate/js/et2_widget_selectbox.js @@ -363,7 +363,6 @@ var et2_selectbox = et2_inputWidget.extend({ return this.set_multi_value(_value); } jQuery("option",this.input).attr("selected", false); - this.value = _value; if(typeof _value == "array") { for(var i = 0; i < _value.length; i++) @@ -390,6 +389,7 @@ var et2_selectbox = et2_inputWidget.extend({ this.egw().debug("warning", "Tried to set value that isn't an option", this, _value); } } + this.value = _value; }, set_multi_value: function(_value) {