diff options
| author | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-07-30 10:55:24 +0000 |
|---|---|---|
| committer | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-07-30 10:55:24 +0000 |
| commit | 2dabeccc3507f7f02566ab08149c9e76c0228f15 (patch) | |
| tree | 6bf0f7c032d579bd41febda54899ad480ec021d3 /frontends/php/services_form.php | |
| parent | 382ce4f1e144cb6f0db18fb7e36eb3c5b2439e0a (diff) | |
| download | zabbix-2dabeccc3507f7f02566ab08149c9e76c0228f15.tar.gz zabbix-2dabeccc3507f7f02566ab08149c9e76c0228f15.tar.xz zabbix-2dabeccc3507f7f02566ab08149c9e76c0228f15.zip | |
- merged rev. 4477:4478 of branches/1.4.2/ (Artem) [fixed status dependency in IT Services, now trigger removed from service if it's has child nodes]
git-svn-id: svn://svn.zabbix.com/trunk@4480 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/services_form.php')
| -rw-r--r-- | frontends/php/services_form.php | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/frontends/php/services_form.php b/frontends/php/services_form.php index 6ad1a7ce..0742d638 100644 --- a/frontends/php/services_form.php +++ b/frontends/php/services_form.php @@ -120,17 +120,11 @@ if(isset($_REQUEST['saction'])){ $service_times = get_request('service_times',array()); $childs = get_request('childs',array()); - if(isset($_REQUEST["linktrigger"])){ - $triggerid = $_REQUEST["triggerid"]; - $status = get_trigger_priority($triggerid); - } - else { - $triggerid = null; - $status = 0; - } + $triggerid = (isset($_REQUEST["linktrigger"]))?($_REQUEST["triggerid"]):(null); + if(isset($service["serviceid"])){ $result = update_service($service["serviceid"], - $_REQUEST["name"],$triggerid,$status,$_REQUEST["algorithm"], + $_REQUEST["name"],$triggerid,$_REQUEST["algorithm"], $_REQUEST["showsla"],$_REQUEST["goodsla"],$_REQUEST["sortorder"], $service_times,$_REQUEST['parentid'],$childs); @@ -140,7 +134,7 @@ if(isset($_REQUEST['saction'])){ } else { $result = add_service( - $_REQUEST["name"],$triggerid,$status,$_REQUEST["algorithm"], + $_REQUEST["name"],$triggerid,$_REQUEST["algorithm"], $_REQUEST["showsla"],$_REQUEST["goodsla"],$_REQUEST["sortorder"], $service_times,$_REQUEST['parentid'],$childs); show_messages($result, S_SERVICE_ADDED, S_CANNOT_ADD_SERVICE); |