From: Jaroslav Kysela <perex@perex.cz>
Date: Tue, 5 Apr 2016 18:56:42 +0000 (+0200)
Subject: webui: fix 'Map all services'
X-Git-Tag: v4.2.1~731
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e8213ed78656f14654d6a9c1729ae374fc3274e;p=thirdparty%2Ftvheadend.git

webui: fix 'Map all services'
---

diff --git a/src/webui/static/app/servicemapper.js b/src/webui/static/app/servicemapper.js
index 4580272a1..b9e38e1aa 100644
--- a/src/webui/static/app/servicemapper.js
+++ b/src/webui/static/app/servicemapper.js
@@ -126,7 +126,7 @@ tvheadend.service_mapper0 = function(all)
         beforeShow: all ? function(panel, conf) {
             var form = panel.getForm();
             var services = form.findField('services');
-            services.on('afterrender', function() {
+            services.store.on('load', function() {
                 services.selectAll();
             });
         } : null,
diff --git a/src/webui/static/lovcombo/lovcombo-all.js b/src/webui/static/lovcombo/lovcombo-all.js
index 4463cf342..9cb155dbf 100644
--- a/src/webui/static/lovcombo/lovcombo-all.js
+++ b/src/webui/static/lovcombo/lovcombo-all.js
@@ -167,8 +167,10 @@ Ext.ux.form.LovCombo = Ext.extend(Ext.form.ComboBox, {
 	 * @private
 	 */
 	,onBeforeQuery:function(qe) {
-	        var d = tvheadend.regexEscape(this.getCheckedDisplay());
-		qe.query = qe.query.replace(new RegExp(d + '[ ' + this.separator + ']*'), '');
+		if (qe.query) {
+		        var d = tvheadend.regexEscape(this.getCheckedDisplay());
+			qe.query = qe.query.replace(new RegExp(d + '[ ' + this.separator + ']*'), '');
+		}
 	} // eo function onBeforeQuery
 	// }}}
 	// {{{