summaryrefslogtreecommitdiffstats
path: root/frontends/php/include
diff options
context:
space:
mode:
authorsasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2008-06-26 12:21:26 +0000
committersasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2008-06-26 12:21:26 +0000
commit63ce91166a8ecd8550db063ba9d9d914ec270e4c (patch)
tree79cc2a1f93f0212a41322848c27137db874d4fda /frontends/php/include
parent35c0395807948dd662cabec7450bd6c5bcfb6b53 (diff)
- [DEV-173] support of notification escalations on server side
changed command status to "executed" in event details screen git-svn-id: svn://svn.zabbix.com/trunk@5799 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include')
-rw-r--r--frontends/php/include/actions.inc.php2
-rw-r--r--frontends/php/include/locales/en_gb.inc.php1
2 files changed, 2 insertions, 1 deletions
diff --git a/frontends/php/include/actions.inc.php b/frontends/php/include/actions.inc.php
index c6d8520a..e7616d29 100644
--- a/frontends/php/include/actions.inc.php
+++ b/frontends/php/include/actions.inc.php
@@ -1069,7 +1069,7 @@ function get_action_cmds_for_event($eventid){
}
if($row["status"] == ALERT_STATUS_SENT){
- $status=new CSpan(S_SENT,"green");
+ $status=new CSpan(S_EXECUTED,"green");
}
else if($row["status"] == ALERT_STATUS_NOT_SENT){
$status=new CSpan(S_IN_PROGRESS,"orange");
diff --git a/frontends/php/include/locales/en_gb.inc.php b/frontends/php/include/locales/en_gb.inc.php
index d4c70f18..30da6a22 100644
--- a/frontends/php/include/locales/en_gb.inc.php
+++ b/frontends/php/include/locales/en_gb.inc.php
@@ -358,6 +358,7 @@
'S_RECIPIENT'=> 'Recipient',
'S_ERROR'=> 'Error',
'S_SENT'=> 'sent',
+ 'S_EXECUTED'=> 'executed',
'S_NOT_SENT'=> 'not sent',
'S_NO_ACTIONS_FOUND'=> 'No actions found',
'S_SHOW_NEXT_100'=> 'Show next 100',