summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2005-03-16 11:10:03 +0000
committerhugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2005-03-16 11:10:03 +0000
commitec2acedf53ab6faaa7d70f33cb9601a04dfc34da (patch)
tree1116c7c59ff3ca58a139ba67c73c56e95863ef3d
parenta4a85d162fd8d528858adf27afc459856d7fbdf4 (diff)
- hard-linked templates works when adding a trigger (Alexei)
git-svn-id: svn://svn.zabbix.com/trunk@1696 97f52cf1-0a1b-0410-bd0e-c28be96e8082
-rw-r--r--ChangeLog1
-rw-r--r--frontends/php/triggers.php5
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index aabb5238..1f85c050 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
Changes for 1.1alpha7:
+ - hard-linked templates works when adding a trigger (Alexei)
- no warning about uninitialised function_str (Alexei)
- fixed simple checks (Alexei)
- fixed startup of housekeeper (Alexei)
diff --git a/frontends/php/triggers.php b/frontends/php/triggers.php
index 7f398da9..77607d9f 100644
--- a/frontends/php/triggers.php
+++ b/frontends/php/triggers.php
@@ -128,8 +128,9 @@
if(isset($_GET["disabled"])) { $status=1; }
else { $status=0; }
- $result=add_trigger($_GET["expression"],$_GET["description"],$_GET["priority"],$status,$_GET["comments"],$_GET["url"]);
- show_messages($result, S_TRIGGER_ADDED, S_CANNOT_ADD_TRIGGER);
+ $triggerid=add_trigger($_GET["expression"],$_GET["description"],$_GET["priority"],$status,$_GET["comments"],$_GET["url"]);
+ add_trigger_to_templates($triggerid);
+ show_messages($triggerid, S_TRIGGER_ADDED, S_CANNOT_ADD_TRIGGER);
}
else
{