diff options
| author | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-04-28 15:25:52 +0000 |
|---|---|---|
| committer | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-04-28 15:25:52 +0000 |
| commit | 4c6e81cdcb98236655c4612143a2fb74fa28b585 (patch) | |
| tree | 9c17dbd4c2e9a10ddcb4923fc40fca9110c6feea /frontends/php/tr_status.php | |
| parent | 787911115963265dd4a9c8cae9178c4868c57e55 (diff) | |
| download | zabbix-4c6e81cdcb98236655c4612143a2fb74fa28b585.tar.gz zabbix-4c6e81cdcb98236655c4612143a2fb74fa28b585.tar.xz zabbix-4c6e81cdcb98236655c4612143a2fb74fa28b585.zip | |
- [DEV-154] added more flexibility to scripts (Artem)
- [DEV-156] added the link from Status of Triggers to Latest data when clicking on a host (Artem)
- [DEV-137] small improvements to GUI (Artem)
git-svn-id: svn://svn.zabbix.com/trunk@5664 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/tr_status.php')
| -rw-r--r-- | frontends/php/tr_status.php | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/frontends/php/tr_status.php b/frontends/php/tr_status.php index 5159fbe6..21f92cc3 100644 --- a/frontends/php/tr_status.php +++ b/frontends/php/tr_status.php @@ -168,7 +168,7 @@ include_once "include/page_header.php"; $scripts_by_hosts = get_accessible_scripts_by_hosts(explode(',',$available_hosts)); - $available_triggers = get_accessible_triggers(PERM_READ_ONLY,PERM_RES_DATA_ARRAY); + $available_triggers = get_accessible_triggers(PERM_READ_ONLY,PERM_RES_IDS_ARRAY); $result=DBselect('SELECT DISTINCT g.groupid,g.name '. ' FROM groups g, hosts_groups hg, hosts h, items i '. @@ -480,8 +480,11 @@ include_once "include/page_header.php"; $menus.= "['".$script['name']."',\"javascript: openWinCentered('scripts_exec.php?execute=1&hostid=".$row['hostid']."&scriptid=".$script['scriptid']."','".S_TOOLS."',760,540,'titlebar=no, resizable=yes, scrollbars=yes, dialog=no');\", null,{'outer' : ['pum_o_item'],'inner' : ['pum_i_item']}],"; } - $menus = trim($menus,','); - if(!empty($menus)) $menus="show_popup_menu(event,[[".zbx_jsvalue(S_TOOLS).",null,null,{'outer' : ['pum_oheader'],'inner' : ['pum_iheader']}],".$menus."],180);"; + $menus.= "[".zbx_jsvalue(S_LINKS).",null,null,{'outer' : ['pum_oheader'],'inner' : ['pum_iheader']}],"; + $menus.= "['".S_LATEST_DATA."',\"javascript: Redirect('latest.php?hostid=".$row['hostid']."')\", null,{'outer' : ['pum_o_item'],'inner' : ['pum_i_item']}],"; + + $menus = rtrim($menus,','); + $menus="show_popup_menu(event,[[".zbx_jsvalue(S_TOOLS).",null,null,{'outer' : ['pum_oheader'],'inner' : ['pum_iheader']}],".$menus."],180);"; $host = new CSpan($row['host']); $host->AddOption('onclick','javascript: '.$menus); |