diff options
| author | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-07-25 13:09:00 +0000 |
|---|---|---|
| committer | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-07-25 13:09:00 +0000 |
| commit | 8ed7e67b6e765ccde12611e14649bb93419843b2 (patch) | |
| tree | 3a6f41d7a86a406885917ecc22634cb113de336f /frontends/php/triggers.php | |
| parent | a61b5185076279d3335014ada21f19d146e46329 (diff) | |
| download | zabbix-8ed7e67b6e765ccde12611e14649bb93419843b2.tar.gz zabbix-8ed7e67b6e765ccde12611e14649bb93419843b2.tar.xz zabbix-8ed7e67b6e765ccde12611e14649bb93419843b2.zip | |
- merged rev. 4464:4466 of branches/1.4.2/ (Artem) [fixed problem with status in "IT Services"]
git-svn-id: svn://svn.zabbix.com/trunk@4467 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/triggers.php')
| -rw-r--r-- | frontends/php/triggers.php | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/frontends/php/triggers.php b/frontends/php/triggers.php index 7c40152b..b1e78a18 100644 --- a/frontends/php/triggers.php +++ b/frontends/php/triggers.php @@ -243,8 +243,11 @@ include_once "include/page_header.php"; $result=DBselect("select triggerid from triggers t where t.triggerid=".zbx_dbstr($triggerid)); if(!($row = DBfetch($result))) continue; - if($result = update_trigger_status($row["triggerid"],0)) - { + if($result = update_trigger_status($row['triggerid'],0)){ + + $status = get_trigger_priority($row['triggerid']); + update_services($triggerid, $status); // updating status to all services by the dependency + add_audit(AUDIT_ACTION_UPDATE, AUDIT_RESOURCE_TRIGGER, S_TRIGGER." [".$triggerid."] [".expand_trigger_description($triggerid)."] ".S_ENABLED); } @@ -255,16 +258,16 @@ include_once "include/page_header.php"; show_messages($result2, S_STATUS_UPDATED, S_CANNOT_UPDATE_STATUS); } } - elseif(isset($_REQUEST["group_disable"])&&isset($_REQUEST["g_triggerid"])) - { - foreach($_REQUEST["g_triggerid"] as $triggerid) - { + elseif(isset($_REQUEST["group_disable"])&&isset($_REQUEST["g_triggerid"])){ + foreach($_REQUEST["g_triggerid"] as $triggerid){ if(!check_right_on_trigger_by_triggerid(null, $triggerid, $accessible_hosts)) continue; $result=DBselect("select triggerid from triggers t where t.triggerid=".zbx_dbstr($triggerid)); if(!($row = DBfetch($result))) continue; - if($result = update_trigger_status($row["triggerid"],1)); - { + if($result = update_trigger_status($row["triggerid"],1));{ + + update_services($triggerid, 0); // updating status to all services by the dependency + add_audit(AUDIT_ACTION_UPDATE, AUDIT_RESOURCE_TRIGGER, S_TRIGGER." [".$triggerid."] [".expand_trigger_description($triggerid)."] ".S_DISABLED); } |