Commit 6b9fbebc authored by David Metzler's avatar David Metzler
Browse files

Fix to menu based documents not passing paremeters properly in document

links. 
parent f45a2748
...@@ -1196,7 +1196,7 @@ class FrxEditor { ...@@ -1196,7 +1196,7 @@ class FrxEditor {
$r = $this->frxReport; $r = $this->frxReport;
$formats = $r->formats ? $r->formats : array_filter(variable_get('forena_doc_defaults', array())); $formats = $r->formats ? $r->formats : array_filter(variable_get('forena_doc_defaults', array()));
$parms = Frx::parms(); $parms = Frx::Data()->getContext('parm');
foreach ($doctypes as $ext) { foreach ($doctypes as $ext) {
if (array_search($ext, $formats) !== FALSE) { if (array_search($ext, $formats) !== FALSE) {
$links[] = array('title' => strtoupper($ext), 'href' => $this->report_link . ".$ext", 'query' => $parms); $links[] = array('title' => strtoupper($ext), 'href' => $this->report_link . ".$ext", 'query' => $parms);
......
...@@ -698,7 +698,7 @@ function forena_parameter_form($formid, &$form_state, $parameters, $attributes= ...@@ -698,7 +698,7 @@ function forena_parameter_form($formid, &$form_state, $parameters, $attributes=
$list = array(); $list = array();
} }
if (isset($menu_parms[$id]) && $type=='textfield') { if (isset($menu_parms[$id]) && $type!='hidden') {
$disabled = TRUE; $disabled = TRUE;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment