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/services_form.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/services_form.php')
-rw-r--r-- | frontends/php/services_form.php | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/frontends/php/services_form.php b/frontends/php/services_form.php index 235198bb..6ad1a7ce 100644 --- a/frontends/php/services_form.php +++ b/frontends/php/services_form.php @@ -120,10 +120,17 @@ if(isset($_REQUEST['saction'])){ $service_times = get_request('service_times',array()); $childs = get_request('childs',array()); - $triggerid = isset($_REQUEST["linktrigger"]) ? $_REQUEST["triggerid"] : null; + if(isset($_REQUEST["linktrigger"])){ + $triggerid = $_REQUEST["triggerid"]; + $status = get_trigger_priority($triggerid); + } + else { + $triggerid = null; + $status = 0; + } if(isset($service["serviceid"])){ $result = update_service($service["serviceid"], - $_REQUEST["name"],$triggerid,$_REQUEST["algorithm"], + $_REQUEST["name"],$triggerid,$status,$_REQUEST["algorithm"], $_REQUEST["showsla"],$_REQUEST["goodsla"],$_REQUEST["sortorder"], $service_times,$_REQUEST['parentid'],$childs); @@ -133,7 +140,7 @@ if(isset($_REQUEST['saction'])){ } else { $result = add_service( - $_REQUEST["name"],$triggerid,$_REQUEST["algorithm"], + $_REQUEST["name"],$triggerid,$status,$_REQUEST["algorithm"], $_REQUEST["showsla"],$_REQUEST["goodsla"],$_REQUEST["sortorder"], $service_times,$_REQUEST['parentid'],$childs); show_messages($result, S_SERVICE_ADDED, S_CANNOT_ADD_SERVICE); |