[icinga-checkins] icinga.org: icinga-web/master: * Fixed predefined editors

git at icinga.org git at icinga.org
Wed Nov 16 13:21:43 CET 2011


Module: icinga-web
Branch: master
Commit: 141a144e3e719f64a939d5fc6eef8c03b87a2842
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=141a144e3e719f64a939d5fc6eef8c03b87a2842

Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Tue Nov 15 08:31:28 2011 +0100

* Fixed predefined editors

---

 .../AppKit/lib/js/icinga/api/RESTFilterComboBox.js |   23 +++++++++----------
 1 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/app/modules/AppKit/lib/js/icinga/api/RESTFilterComboBox.js b/app/modules/AppKit/lib/js/icinga/api/RESTFilterComboBox.js
index 1c06e90..4a9269d 100755
--- a/app/modules/AppKit/lib/js/icinga/api/RESTFilterComboBox.js
+++ b/app/modules/AppKit/lib/js/icinga/api/RESTFilterComboBox.js
@@ -19,6 +19,7 @@ Icinga.Api.RESTFilterComboBox = Ext.extend(Ext.ux.AutoComboBox,{
         cfg.displayField = cfg.targetField; 
         cfg.valueField = cfg.targetField; 
         this.storeFieldName = cfg.targetField;
+        AppKit.log(cfg);
         cfg.store = store; 
         Ext.ux.AutoComboBox.prototype.constructor.call(this,cfg);
 
@@ -83,50 +84,48 @@ Icinga.Api.RESTFilterComboBox = Ext.extend(Ext.ux.AutoComboBox,{
 
 Icinga.Api.HostgroupsComboBox = Ext.extend(Icinga.Api.RESTFilterComboBox, {
     constructor: function(cfg) {
-        cfg = cfg || {};
-        Icinga.Api.RESTFilterComboBox.prototype.constructor.call(this,Ext.apply(cfg,{
+
+        Icinga.Api.RESTFilterComboBox.prototype.constructor.call(this,{
             targetField: 'HOSTGROUP_NAME',
             idField: 'HOSTGROUP_ID',
             target: 'hostgroup',
             displayField: 'HOSTGROUP_NAME'
-        }));
+        });
     }
 });
 
 Icinga.Api.ServicegroupsComboBox = Ext.extend(Icinga.Api.RESTFilterComboBox, {
     constructor: function(cfg) {
-        cfg = cfg || {};
-        Icinga.Api.RESTFilterComboBox.prototype.constructor.call(this,Ext.apply(cfg,{
+        Icinga.Api.RESTFilterComboBox.prototype.constructor.call(this,{
             targetField: 'SERVICEGROUP_NAME',
             idField: 'SERVICEGROUP_ID',
             target: 'servicegroup',
             displayField: 'SERVICEGROUP_NAME'
-        }));
+        });
     }
 });
 
 
 Icinga.Api.HostsComboBox = Ext.extend(Icinga.Api.RESTFilterComboBox, {
     constructor: function(cfg) {
-        cfg = cfg || {};
-        Icinga.Api.RESTFilterComboBox.prototype.constructor.call(this,Ext.apply(cfg,{
+        Icinga.Api.RESTFilterComboBox.prototype.constructor.call(this,{
             targetField: 'HOST_NAME',
             idField: 'HOST_ID',
             target: 'host',
             displayField: 'HOST_NAME'
-        }));
+        });
     }
 });
 
 Icinga.Api.ServicesComboBox = Ext.extend(Icinga.Api.RESTFilterComboBox, {
     constructor: function(cfg) {
-        cfg = cfg || {};
-        Icinga.Api.RESTFilterComboBox.prototype.constructor.call(this,Ext.apply(cfg,{
+
+        Icinga.Api.RESTFilterComboBox.prototype.constructor.call(this,{
             targetField: 'SERVICE_NAME',
             target: 'service',
             idField: 'SERVICE_ID',
             displayField: 'SERVICE_NAME'
-        }));
+        });
     }
 });
 Ext.reg('IcingaRESTComboBox', Icinga.Api.RESTFilterComboBox);





More information about the icinga-checkins mailing list