diff options
| author | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-03-16 15:26:21 +0000 |
|---|---|---|
| committer | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-03-16 15:26:21 +0000 |
| commit | d76992f73658df06227395e4a79c4366294efebe (patch) | |
| tree | 20acf2af5d2155e07401c4903b9bb4cddfb4fec2 /frontends/php/include/actions.inc.php | |
| parent | f9fade8feec4ed06a5f433f87d09adc4098bb51e (diff) | |
| download | zabbix-d76992f73658df06227395e4a79c4366294efebe.tar.gz zabbix-d76992f73658df06227395e4a79c4366294efebe.tar.xz zabbix-d76992f73658df06227395e4a79c4366294efebe.zip | |
- added trigger selecton from popup (Eugene)
- improved popup selection (Eugene)
- improved "IT services" configuration (Eugene)
git-svn-id: svn://svn.zabbix.com/trunk@2702 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include/actions.inc.php')
| -rw-r--r-- | frontends/php/include/actions.inc.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/frontends/php/include/actions.inc.php b/frontends/php/include/actions.inc.php index 3993d2a7..25a64cb0 100644 --- a/frontends/php/include/actions.inc.php +++ b/frontends/php/include/actions.inc.php @@ -298,8 +298,7 @@ } if($conditiontype==CONDITION_TYPE_TRIGGER) { - $trigger=get_trigger_by_triggerid($value); - if($trigger) $desc=S_TRIGGER." $op "."\"".$trigger["description"]."\""; + $desc=S_TRIGGER." $op "."\"".expand_trigger_description($value)."\""; } else if($conditiontype==CONDITION_TYPE_HOST) { |
