- added trigger selecton from popup (Eugene)

 - improved popup selection (Eugene)
 - improved "IT services" configuration (Eugene)


git-svn-id: svn://svn.zabbix.com/trunk@2702 97f52cf1-0a1b-0410-bd0e-c28be96e8082

3 files changed, 21 insertions, 1 deletions

diff --git a/frontends/php/include/classes/cform.inc.php b/frontends/php/include/classes/cform.inc.php
index 3dee3109..ace2a10b 100644
--- a/frontends/php/include/classes/cform.inc.php
+++ b/frontends/php/include/classes/cform.inc.php
@@ -39,8 +39,16 @@
 		}
 		function SetAction($value=NULL)
 		{
+			global $page;
+
 			if(is_null($value))
+			{
+				if(isset($page["file"]))	
+				{
+					return $this->AddOption("action",$page["file"]);
+				}
 				return 1;
+			}
 			elseif(!is_string($value))
 			{
 				return $this->error("Incorrect value for SetAction [$value]");
diff --git a/frontends/php/include/classes/clink.inc.php b/frontends/php/include/classes/clink.inc.php
index dd32db42..354b7579 100644
--- a/frontends/php/include/classes/clink.inc.php
+++ b/frontends/php/include/classes/clink.inc.php
@@ -35,6 +35,18 @@
 			$this->AddItem($item);
 			$this->SetUrl($url);
 		}
+		function SetAction($value=NULL)
+		{
+			if(is_null($value))
+			{
+				return $this->AddOption("action",$page["file"]);
+			}
+			elseif(!is_string($value))
+			{
+				return $this->error("Incorrect value for SetAction [$value]");
+			}
+			return $this->AddOption("onClick",$value);
+		}
 		function SetUrl($value)
 		{
 			if(is_null($value))
diff --git a/frontends/php/include/classes/ctag.inc.php b/frontends/php/include/classes/ctag.inc.php
index 8a115bde..563ad4eb 100644
--- a/frontends/php/include/classes/ctag.inc.php
+++ b/frontends/php/include/classes/ctag.inc.php
@@ -119,7 +119,7 @@
 			}
 			if(!is_string($value) && !is_int($value) && !is_float($value))
 			{
-				return $this->error("Incorrect value for AddOption [$value]");
+				return $this->error("Incorrect value for AddOption [$name] [$value]");
 			}
 			
 			$this->options[$name] = htmlspecialchars(strval($value));