webui: fix 'Map all services'

diff --git a/src/webui/static/app/servicemapper.js b/src/webui/static/app/servicemapper.js
index 4580272a199d3594ce7097ffef6a242cdd209ee2..b9e38e1aa0b2ffec68c68865f7af032f6474747f 100644 (file)
--- 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 4463cf34210acbdbe83e91e1acd379e0eb3370b6..9cb155dbf235db0a54ee1dd2cf3a968dacf9a00c 100644 (file)
--- 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
        // }}}
        // {{{