summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2004-02-10 21:38:10 +0000
committerhugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2004-02-10 21:38:10 +0000
commit06cdbc8efbf1a317c8a0ae00a14b9bb9623fef74 (patch)
treefc97a5a003b1f1fa907876a0c37051da54c46824
parent332818a9fecc45c189de246fffcbf33e339c118f (diff)
downloadzabbix-06cdbc8efbf1a317c8a0ae00a14b9bb9623fef74.tar.gz
zabbix-06cdbc8efbf1a317c8a0ae00a14b9bb9623fef74.tar.xz
zabbix-06cdbc8efbf1a317c8a0ae00a14b9bb9623fef74.zip
- fixed trigger update. Value of the trigger sets to UNKNOWN. (Alexei)
git-svn-id: svn://svn.zabbix.com/trunk@1253 97f52cf1-0a1b-0410-bd0e-c28be96e8082
-rw-r--r--ChangeLog1
-rw-r--r--TODO1
-rw-r--r--frontends/php/include/config.inc.php3
3 files changed, 3 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 138706fe..7a149912 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
Changes for 1.0beta14:
+ - fixed trigger update. Value of the trigger sets to UNKNOWN. (Alexei)
- fixed --with-[net|ucd]-snmp to work with various paths (Alexei)
- changed css.css to follow W3C standard (Alexei)
- changed DB schema. Dropped foreign key for table actions (Alexei)
diff --git a/TODO b/TODO
index c12e7191..c9fbe06b 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,5 @@
1.0:
- - trigger UNKNOWN does not change status to FALSE (it's ok for TRUE)
- see severity in trigger listing for a host
- change logic for actions: scope =1 (triggerid=hostid), 2 (triggerid = NULL)
- check simple check FTP under Mandrake 9.0: https://sourceforge.net/forum/message.php?msg_id=2410500
diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php
index 61a48afd..2411e696 100644
--- a/frontends/php/include/config.inc.php
+++ b/frontends/php/include/config.inc.php
@@ -2594,7 +2594,8 @@ where h.hostid=i.hostid and i.itemid=f.itemid and f.triggerid=$triggerid";
$expression=implode_exp($expression,$triggerid);
add_alarm($triggerid,2);
- $sql="update triggers set expression='$expression',description='$description',priority=$priority,status=$status,comments='$comments',url='$url' where triggerid=$triggerid";
+// $sql="update triggers set expression='$expression',description='$description',priority=$priority,status=$status,comments='$comments',url='$url' where triggerid=$triggerid";
+ $sql="update triggers set expression='$expression',description='$description',priority=$priority,status=$status,comments='$comments',url='$url',value=2 where triggerid=$triggerid";
return DBexecute($sql);
}