[icinga-checkins] icinga.org: icinga-web/master: * 'contains not' filter now works ( notice the new icinga-api version)

git at icinga.org git at icinga.org
Thu Sep 9 12:16:31 CEST 2010


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

Author: jmosshammer <jmosshammer at ws-jmosshammer.(none)>
Date:   Thu Sep  9 12:15:43 2010 +0200

* 'contains not' filter now works (notice the new icinga-api version)

---

 .../lib/database/AppKitSQLConstants.class.php      |    1 +
 .../System/ViewProc/js/IcingaGridFilterHandler.js  |    2 +-
 .../lib/template/IcingaTemplateWorker.class.php    |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/modules/AppKit/lib/database/AppKitSQLConstants.class.php b/app/modules/AppKit/lib/database/AppKitSQLConstants.class.php
index 0dd1a4c..9843bfc 100755
--- a/app/modules/AppKit/lib/database/AppKitSQLConstants.class.php
+++ b/app/modules/AppKit/lib/database/AppKitSQLConstants.class.php
@@ -32,6 +32,7 @@ class AppKitSQLConstants {
 		self::SQL_OP_IS				=> IcingaApi::MATCH_EXACT,
 		self::SQL_OP_NOTIS			=> IcingaApi::MATCH_NOT_EQUAL,
 		self::SQL_OP_CONTAIN		=> IcingaApi::MATCH_LIKE,
+		self::SQL_OP_NOTCONTAIN		=> IcingaApi::MATCH_NOT_LIKE,
 		self::SQL_OP_GREATERTHAN	=> IcingaApi::MATCH_GREATER_THAN,
 		self::SQL_OP_LESSTHAN		=> IcingaApi::MATCH_LESS_THAN,
 		self::SQL_OP_GREATEROREQUAL	=> IcingaApi::MATCH_GREATER_OR_EQUAL,
diff --git a/app/modules/Cronks/templates/System/ViewProc/js/IcingaGridFilterHandler.js b/app/modules/Cronks/templates/System/ViewProc/js/IcingaGridFilterHandler.js
index 536d5fd..9b31afc 100755
--- a/app/modules/Cronks/templates/System/ViewProc/js/IcingaGridFilterHandler.js
+++ b/app/modules/Cronks/templates/System/ViewProc/js/IcingaGridFilterHandler.js
@@ -183,7 +183,7 @@ Cronk.util.GridFilterWindow = function() {
 					mode: 'local',
 					typeAhead: true,
 					triggerAction: 'all',
-					forceSelection: true,
+					forceSelection: false,
 					
 					
 					fieldLabel: _("Add restriction"),
diff --git a/app/modules/Web/lib/template/IcingaTemplateWorker.class.php b/app/modules/Web/lib/template/IcingaTemplateWorker.class.php
index ea1524c..e3e2d01 100755
--- a/app/modules/Web/lib/template/IcingaTemplateWorker.class.php
+++ b/app/modules/Web/lib/template/IcingaTemplateWorker.class.php
@@ -411,7 +411,7 @@ class IcingaTemplateWorker {
 		}
 		
 		// Add or replace some asterix within count
-		if ($op == AppKitSQLConstants::SQL_OP_CONTAIN) {
+		if ($op == AppKitSQLConstants::SQL_OP_CONTAIN || $op == AppKitSQLConstants::SQL_OP_NOTCONTAIN) {
 			if (strpos($val, '*') === false) {
 				$val = $val. '%';
 			}





More information about the icinga-checkins mailing list