[icinga-checkins] icinga.org: icinga-web/jmosshammer/default2: * Allow text filter in combos

git at icinga.org git at icinga.org
Mon Jul 19 10:36:00 CEST 2010


Module: icinga-web
Branch: jmosshammer/default2
Commit: f724a24c55a108b17a9dafe9c87d0ef71f3e11ca
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=f724a24c55a108b17a9dafe9c87d0ef71f3e11ca

Author: Marius Hein <marius.hein at netways.de>
Date:   Tue Jun 22 15:36:30 2010 +0200

* Allow text filter in combos
* Added key handler for filter forms

---

 app/modules/Cronks/lib/js/FilterHandler.js         |    2 +-
 .../System/ViewProc/js/IcingaGridFilterHandler.js  |   10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/modules/Cronks/lib/js/FilterHandler.js b/app/modules/Cronks/lib/js/FilterHandler.js
index a157e9a..bb03fe2 100755
--- a/app/modules/Cronks/lib/js/FilterHandler.js
+++ b/app/modules/Cronks/lib/js/FilterHandler.js
@@ -296,7 +296,7 @@ Cronk.FilterHandler = Ext.extend(Ext.util.Observable, {
 		return new Cronk.IcingaApiComboBox({
 			typeAhead: true,
 			triggerAction: 'all',
-			forceSelection: true,
+			forceSelection: false,
 			'name': meta.name + '-field',
 			'id': meta.name + '-field',
 			hiddenName: meta.name + '-value',
diff --git a/app/modules/Cronks/templates/System/ViewProc/js/IcingaGridFilterHandler.js b/app/modules/Cronks/templates/System/ViewProc/js/IcingaGridFilterHandler.js
index 5d6cfba..b2acfe3 100755
--- a/app/modules/Cronks/templates/System/ViewProc/js/IcingaGridFilterHandler.js
+++ b/app/modules/Cronks/templates/System/ViewProc/js/IcingaGridFilterHandler.js
@@ -112,7 +112,15 @@ var IcingaGridFilterWindow = function() {
 						oGrid.fireEvent('activate');
 					}
 				},
-				
+
+				keys: {
+					key: 13,
+					fn: function() {
+						this.applyFilters();
+					},
+					scope: pub
+				},
+
 				bbar: {
 					items: [{
 						text: _("Apply"),





More information about the icinga-checkins mailing list