[icinga-checkins] icinga.org: icinga-web/master: * Removed the doubleclick (THE DOUBLECLICK, save the doubleclick)

git at icinga.org git at icinga.org
Thu May 27 15:03:36 CEST 2010


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

Author: Marius Hein <marius.hein at netways.de>
Date:   Thu May 27 15:01:28 2010 +0200

* Removed the doubleclick (THE DOUBLECLICK, save the doubleclick)
* Fixed deprecated issue on the api container model

---

 .../Cronks/data/xml/icinga-host-template.xml       |    6 +++---
 .../data/xml/icinga-hostgroup-summary-template.xml |    4 ++--
 .../Cronks/data/xml/icinga-service-template.xml    |    4 ++--
 .../xml/icinga-servicegroup-summary-template.xml   |    2 +-
 .../Web/models/Icinga/ApiContainerModel.class.php  |    8 +++++++-
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/app/modules/Cronks/data/xml/icinga-host-history-template.xml b/app/modules/Cronks/data/xml/icinga-host-history-template.xml
old mode 100755
new mode 100644
diff --git a/app/modules/Cronks/data/xml/icinga-host-template.xml b/app/modules/Cronks/data/xml/icinga-host-template.xml
old mode 100755
new mode 100644
index e2bda3e..6618d75
--- a/app/modules/Cronks/data/xml/icinga-host-template.xml
+++ b/app/modules/Cronks/data/xml/icinga-host-template.xml
@@ -302,7 +302,7 @@
 	                	<parameter name="function">subGrid</parameter>
 	                	
 	                	<!-- renderer/gridevent[cellclick|celldblclick|...] -->
-	                	<parameter name="type">celldblclick</parameter>
+	                	<parameter name="type">cellclick</parameter>
 	                	
 	                	<parameter name="arguments">
 	                		<parameter name="idPrefix">servicesForHost</parameter>
@@ -375,7 +375,7 @@
 	                	<parameter name="function">ajaxClick</parameter>
 
 	                	<!-- renderer/gridevent[cellclick|celldblclick|...] -->
-	                	<parameter name="type">celldblclick</parameter>
+	                	<parameter name="type">cellclick</parameter>
 
 	                	<parameter name="arguments">
 	                		<parameter name="src_id">hostinfo</parameter>
@@ -436,7 +436,7 @@
 	                	<parameter name="function">subGrid</parameter>
 	                	
 	                	<!-- renderer/gridevent[cellclick|celldblclick|...] -->
-	                	<parameter name="type">celldblclick</parameter>
+	                	<parameter name="type">cellclick</parameter>
 	                	
 	                	<parameter name="arguments">
 	                		<parameter name="idPrefix">historyForHost</parameter>
diff --git a/app/modules/Cronks/data/xml/icinga-hostgroup-summary-template.xml b/app/modules/Cronks/data/xml/icinga-hostgroup-summary-template.xml
old mode 100755
new mode 100644
index 06b898a..082dab8
--- a/app/modules/Cronks/data/xml/icinga-hostgroup-summary-template.xml
+++ b/app/modules/Cronks/data/xml/icinga-hostgroup-summary-template.xml
@@ -273,7 +273,7 @@
 	                	<parameter name="function">subGrid</parameter>
 	                	
 	                	<!-- renderer/gridevent[cellclick|celldblclick|...] -->
-	                	<parameter name="type">celldblclick</parameter>
+	                	<parameter name="type">cellclick</parameter>
 	                	
 	                	<parameter name="arguments">
 	                		<parameter name="idPrefix">hostgroupHosts</parameter>
@@ -329,7 +329,7 @@
 	                	<parameter name="function">subGrid</parameter>
 	                	
 	                	<!-- renderer/gridevent[cellclick|celldblclick|...] -->
-	                	<parameter name="type">celldblclick</parameter>
+	                	<parameter name="type">cellclick</parameter>
 	                	
 	                	<parameter name="arguments">
 	                		<parameter name="idPrefix">hostgroupServices</parameter>
diff --git a/app/modules/Cronks/data/xml/icinga-log-template.xml b/app/modules/Cronks/data/xml/icinga-log-template.xml
old mode 100755
new mode 100644
diff --git a/app/modules/Cronks/data/xml/icinga-notification-template.xml b/app/modules/Cronks/data/xml/icinga-notification-template.xml
old mode 100755
new mode 100644
diff --git a/app/modules/Cronks/data/xml/icinga-service-history-template.xml b/app/modules/Cronks/data/xml/icinga-service-history-template.xml
old mode 100755
new mode 100644
diff --git a/app/modules/Cronks/data/xml/icinga-service-template.xml b/app/modules/Cronks/data/xml/icinga-service-template.xml
old mode 100755
new mode 100644
index 6bb7491..9a09ca3
--- a/app/modules/Cronks/data/xml/icinga-service-template.xml
+++ b/app/modules/Cronks/data/xml/icinga-service-template.xml
@@ -389,7 +389,7 @@
 	                	<parameter name="function">ajaxClick</parameter>
 
 	                	<!-- renderer/gridevent[cellclick|celldblclick|...] -->
-	                	<parameter name="type">celldblclick</parameter>
+	                	<parameter name="type">cellclick</parameter>
 
 	                	<parameter name="arguments">
 	                		<parameter name="src_id">serviceinfo</parameter>
@@ -451,7 +451,7 @@
 	                	<parameter name="function">subGrid</parameter>
 	                	
 	                	<!-- renderer/gridevent[cellclick|celldblclick|...] -->
-	                	<parameter name="type">celldblclick</parameter>
+	                	<parameter name="type">cellclick</parameter>
 	                	
 	                	<parameter name="arguments">
 	                		<parameter name="idPrefix">historyForService</parameter>
diff --git a/app/modules/Cronks/data/xml/icinga-servicegroup-summary-template.xml b/app/modules/Cronks/data/xml/icinga-servicegroup-summary-template.xml
old mode 100755
new mode 100644
index 19666d2..6915a97
--- a/app/modules/Cronks/data/xml/icinga-servicegroup-summary-template.xml
+++ b/app/modules/Cronks/data/xml/icinga-servicegroup-summary-template.xml
@@ -269,7 +269,7 @@
 	                	<parameter name="function">subGrid</parameter>
 	                	
 	                	<!-- renderer/gridevent[cellclick|celldblclick|...] -->
-	                	<parameter name="type">celldblclick</parameter>
+	                	<parameter name="type">cellclick</parameter>
 	                	
 	                	<parameter name="arguments">
 	                		<parameter name="idPrefix">servicegroupServices</parameter>
diff --git a/app/modules/Cronks/data/xml/icinga-tactical-overview-template-cv.xml b/app/modules/Cronks/data/xml/icinga-tactical-overview-template-cv.xml
old mode 100755
new mode 100644
diff --git a/app/modules/Cronks/data/xml/icinga-tactical-overview-template-hg.xml b/app/modules/Cronks/data/xml/icinga-tactical-overview-template-hg.xml
old mode 100755
new mode 100644
diff --git a/app/modules/Cronks/data/xml/icinga-tactical-overview-template.xml b/app/modules/Cronks/data/xml/icinga-tactical-overview-template.xml
old mode 100755
new mode 100644
diff --git a/app/modules/Web/models/Icinga/ApiContainerModel.class.php b/app/modules/Web/models/Icinga/ApiContainerModel.class.php
index 0ffb791..014469a 100755
--- a/app/modules/Web/models/Icinga/ApiContainerModel.class.php
+++ b/app/modules/Web/models/Icinga/ApiContainerModel.class.php
@@ -204,7 +204,13 @@ implements AgaviISingletonModel {
 	 */
 	public function createSearch() {
 		$a = func_get_args();
-		return call_user_method_array('createSearch', $this->getConnection(), $a);
+		$ref = new ReflectionObject($this->getConnection());
+		if ($ref->hasMethod('createSearch')) {
+			$m = $ref->getMethod('createSearch');
+			return $m->invokeArgs($this->getConnection(), $a);
+		}
+		
+		throw new IcingaApiException("Could not create search (method not found)");
 	}
 	
 	/**





More information about the icinga-checkins mailing list