diff options
| author | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-06-11 12:54:35 +0000 |
|---|---|---|
| committer | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-06-11 12:54:35 +0000 |
| commit | 2d69d2f3070bc71ef09d064da117f69c14b8206d (patch) | |
| tree | f9536a4c6b7acf8c87adc620b5238e6b640ff1d0 /frontends/php/include | |
| parent | d2b78889450f7256e878376e71fe025191060af9 (diff) | |
| download | zabbix-2d69d2f3070bc71ef09d064da117f69c14b8206d.tar.gz zabbix-2d69d2f3070bc71ef09d064da117f69c14b8206d.tar.xz zabbix-2d69d2f3070bc71ef09d064da117f69c14b8206d.zip | |
- [DEV-137] fixed IT services (Artem)
git-svn-id: svn://svn.zabbix.com/trunk@5757 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include')
| -rw-r--r-- | frontends/php/include/services.inc.php | 4 | ||||
| -rw-r--r-- | frontends/php/include/triggers.inc.php | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/frontends/php/include/services.inc.php b/frontends/php/include/services.inc.php index b7845128..8e7adfcd 100644 --- a/frontends/php/include/services.inc.php +++ b/frontends/php/include/services.inc.php @@ -148,9 +148,9 @@ function get_service_status($serviceid,$algorithm,$triggerid=null,$status=0){ if(is_numeric($triggerid)){ - $status = ($serv_status = get_service_status_of_trigger(triggerid))?$serv_status:$status; + $status = ($serv_status = get_service_status_of_trigger($triggerid))?$serv_status:$status; } - + if((SERVICE_ALGORITHM_MAX == $algorithm) || (SERVICE_ALGORITHM_MIN == $algorithm)){ $sort_order = (SERVICE_ALGORITHM_MAX == $algorithm)?' DESC ':' ASC '; diff --git a/frontends/php/include/triggers.inc.php b/frontends/php/include/triggers.inc.php index fb7b9d81..906bc577 100644 --- a/frontends/php/include/triggers.inc.php +++ b/frontends/php/include/triggers.inc.php @@ -293,8 +293,9 @@ ' WHERE triggerid='.$triggerid. ' AND status='.TRIGGER_STATUS_ENABLED. ' AND value='.TRIGGER_VALUE_TRUE; - + $status = ($rows=DBfetch(DBselect($sql,1)))?$rows['priority']:0; + return $status; } |