diff options
| author | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-04-17 15:02:02 +0000 |
|---|---|---|
| committer | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-04-17 15:02:02 +0000 |
| commit | b82812f00576369e65c996ef51264de66ce63d57 (patch) | |
| tree | a3ba8c407e03edd1905f591aa2d14bf32acc4f9b /frontends/php/services.php | |
| parent | cd6be85dfcfccb202f2d2a9ca9db062725e45d5c (diff) | |
| download | zabbix-b82812f00576369e65c996ef51264de66ce63d57.tar.gz zabbix-b82812f00576369e65c996ef51264de66ce63d57.tar.xz zabbix-b82812f00576369e65c996ef51264de66ce63d57.zip | |
- [DEV-137] fixes in graph zoom for KQ (Artem)
- [DEV-137] fixes for possible errors under Oracle (Artem)
git-svn-id: svn://svn.zabbix.com/trunk@5632 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/services.php')
| -rw-r--r-- | frontends/php/services.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/frontends/php/services.php b/frontends/php/services.php index 51b55154..cab259fd 100644 --- a/frontends/php/services.php +++ b/frontends/php/services.php @@ -60,7 +60,7 @@ include_once "include/page_header.php"; //-------------------------------------------------------------------------- -$available_triggers = get_accessible_triggers(PERM_READ_ONLY, null, get_current_nodeid()); +$available_triggers = get_accessible_triggers(PERM_READ_ONLY, PERM_RES_IDS_ARRAY); $query = 'SELECT DISTINCT s.serviceid, sl.servicedownid, sl_p.serviceupid as serviceupid, s.triggerid, '. ' s.name as caption, s.algorithm, t.description, t.expression, s.sortorder, sl.linkid, s.showsla, s.goodsla, s.status '. @@ -69,7 +69,7 @@ $query = 'SELECT DISTINCT s.serviceid, sl.servicedownid, sl_p.serviceupid as ser ' LEFT JOIN services_links sl ON s.serviceid = sl.serviceupid and NOT(sl.soft=0) '. ' LEFT JOIN services_links sl_p ON s.serviceid = sl_p.servicedownid and sl_p.soft=0 '. ' WHERE '.DBin_node('s.serviceid'). - ' AND (t.triggerid IS NULL OR t.triggerid IN ('.$available_triggers.')) '. + ' AND (t.triggerid IS NULL OR '.DBcondition('t.triggerid',$available_triggers).') '. ' ORDER BY s.sortorder, sl_p.serviceupid, s.serviceid'; $result=DBSelect($query); |