diff options
| author | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-01-07 13:29:16 +0000 |
|---|---|---|
| committer | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-01-07 13:29:16 +0000 |
| commit | d82f4f660f480ecbc7eaf5e7fd42140803908cfb (patch) | |
| tree | b930c8c59d2e26f3304da5a234a5c8ca78f58458 /frontends/php/acknow.php | |
| parent | 5bbc8ab6911eeeb79bc6f88dab5f53394de3b630 (diff) | |
| download | zabbix-d82f4f660f480ecbc7eaf5e7fd42140803908cfb.tar.gz zabbix-d82f4f660f480ecbc7eaf5e7fd42140803908cfb.tar.xz zabbix-d82f4f660f480ecbc7eaf5e7fd42140803908cfb.zip | |
- [ZBX-246] fixed header error in Monitoring->slideshows (Artem)
- added history view in ackowledge screen (Artem)
git-svn-id: svn://svn.zabbix.com/trunk@5231 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/acknow.php')
| -rw-r--r-- | frontends/php/acknow.php | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/frontends/php/acknow.php b/frontends/php/acknow.php index 1ae2a521..07f55ac9 100644 --- a/frontends/php/acknow.php +++ b/frontends/php/acknow.php @@ -26,7 +26,8 @@ $page["title"] = "S_ACKNOWLEDGES"; $page["file"] = "acknow.php"; - + $page['hist_arg'] = array('eventid'); + include_once "include/page_header.php"; ?> @@ -35,8 +36,8 @@ include_once "include/page_header.php"; // VAR TYPE OPTIONAL FLAGS VALIDATION EXCEPTION $fields=array( - 'eventid'=> array(T_ZBX_INT, O_OPT, P_SYS, DB_ID, '!isset({events})&&!isset({cancel})'), - 'events'=> array(T_ZBX_INT, O_OPT, P_SYS, DB_ID, '!isset({eventid})&&!isset({cancel})'), + 'eventid'=> array(T_ZBX_INT, O_OPT, P_SYS, DB_ID, null), + 'events'=> array(T_ZBX_INT, O_OPT, P_SYS, DB_ID, null), 'message'=> array(T_ZBX_STR, O_OPT, NULL, $bulk ? NULL : NOT_EMPTY, 'isset({save})||isset({saveandreturn})'), /* actions */ 'bulkacknowledge'=> array(T_ZBX_STR,O_OPT, P_ACT|P_SYS, NULL, NULL), @@ -46,6 +47,11 @@ include_once "include/page_header.php"; ); check_fields($fields); + if(!isset($_REQUEST['events']) && !isset($_REQUEST['eventid'])){ + show_message(S_NO_EVENTS_TO_ACKNOWLEDGE); + include_once("include/page_footer.php"); + } + if(isset($_REQUEST['eventid'])){ $events[$_REQUEST['eventid']] = $_REQUEST['eventid']; } |