- added group operations for actions (Eugene)

 - frontend support for action status (Eugene)


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

1 files changed, 12 insertions, 1 deletions

diff --git a/frontends/php/include/triggers.inc.php b/frontends/php/include/triggers.inc.php
index 36a19c52..e752b37a 100644
--- a/frontends/php/include/triggers.inc.php
+++ b/frontends/php/include/triggers.inc.php
@@ -647,6 +647,8 @@
                 {
                         return  $result;
                 }
+		DBexecute("delete from trigger_depends where triggerid_up=$triggerid");
+
 		$result=delete_function_by_triggerid($triggerid);
 		if(!$result)
 		{
@@ -663,9 +665,18 @@
 			return	$result;
 		}
 
-		DBexecute("delete from trigger_depends where triggerid_up=$triggerid");
+		DBexecute("delete from alerts where triggerid=$triggerid");
 
 		DBexecute("update sysmaps_links set triggerid=NULL where triggerid=$triggerid");
+		
+		$db_actions = DBselect("select distinct c.actionid from conditions c, triggers t".
+			" where c.conditiontype=CONDITION_TYPE_TRIGGER".
+			" and c.value=t.triggerid");
+		while($db_action = DBfetch($db_actions))
+		{
+			DBexecute("update actions set status=".ACTION_STATUS_DISABLED.
+				" where actionid=".$db_action["actionid"]);
+		}
 
 		$trigger = get_trigger_by_triggerid($triggerid);