From c428e67f1c7ad2f5080e1ec15aa88932dc5f922c Mon Sep 17 00:00:00 2001 From: "Jehan-Guillaume (ioguix) de Rorthais" Date: Tue, 5 Mar 2013 23:45:06 +0100 Subject: [PATCH] Fix navlinks when browsing results from a Report Navlinks hadn't report related parameters set. So when clicking on expend/collapse or refresh, the link just ignores we where browsing a report result set. In consequence, the trail and navlinks in the printed page where broken. --- plugins/Report/plugin.php | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/plugins/Report/plugin.php b/plugins/Report/plugin.php index 467a7646..941129bc 100644 --- a/plugins/Report/plugin.php +++ b/plugins/Report/plugin.php @@ -76,7 +76,7 @@ class Report extends Plugin { $hooks = array( 'tabs' => array('add_plugin_tabs'), 'trail' => array('add_plugin_trail'), - 'navlinks' => array('add_plugin_navlinks') + 'navlinks' => array('plugin_navlinks') ); return $hooks; } @@ -214,7 +214,7 @@ class Report extends Plugin { * Add plugin in the navlinks * @param $plugin_functions_parameters */ - function add_plugin_navlinks(&$params) { + function plugin_navlinks(&$params) { global $misc, $lang; if ( @@ -290,6 +290,30 @@ class Report extends Plugin { ), 'content' => $this->lang['streditreport'] ); + + /* edit collapse link to add report related vars */ + $params['navlinks']['collapse']['attr']['href']['urlvars'] + ['plugin'] = $this->name; + $params['navlinks']['collapse']['attr']['href']['urlvars'] + ['report_id'] = $_REQUEST['report_id']; + $params['navlinks']['collapse']['attr']['href']['urlvars'] + ['report'] = $_REQUEST['report']; + + /* edit refresh link to add report related vars */ + $params['navlinks']['refresh']['attr']['href']['urlvars'] + ['plugin'] = $this->name; + $params['navlinks']['refresh']['attr']['href']['urlvars'] + ['report_id'] = $_REQUEST['report_id']; + $params['navlinks']['refresh']['attr']['href']['urlvars'] + ['report'] = $_REQUEST['report']; + + if (isset($_REQUEST['action'])) { + $params['navlinks']['collapse']['attr']['href']['urlvars'] + ['action'] = $_REQUEST['action']; + + $params['navlinks']['refresh']['attr']['href']['urlvars'] + ['action'] = $_REQUEST['action']; + } } if (isset($_REQUEST['schema'])) -- 2.39.5