Commit c4e2e388 authored by metzlerd's avatar metzlerd
Browse files

Fixed bug in filters displaying unsaved reports.

Save cancel now goes back to report. 
parent b88d2192
......@@ -44,7 +44,7 @@ class FrxEditor {
$dom->formatOutput = TRUE;
$dom->preserveWhiteSpace = TRUE;
$this->frxReport = new FrxReport();
$this->load($report_name);
$this->load($report_name, $edit);
$cache = forena_load_cache($this->frxReport->rpt_xml);
if (isset($cache['access'])) $this->access = forena_check_all_access($cache['access']);
}
......
......@@ -922,7 +922,7 @@ function forena_report($name_in, $parms = NULL, $print = TRUE) {
$report_name = $desc['name'];
// Load dataTable plugin if possible.
//forena_include_data_tables();
$content = Frx::Editor($name_in, FALSE)->report($parms, $print, FALSE);
$content = Frx::Editor($name_in, $print)->report($parms, $print, FALSE);
$m_path = drupal_get_path('module', 'forena');
if ($content) {
......
......@@ -760,7 +760,7 @@ function forena_update_cancel($form, &$form_state) {
function forena_report_save_cancel($form, &$form_state) {
extract($form_state['values']);
Frx::Editor($report_name)->cancel();
$form_state['redirect'] = 'forena';
$form_state['redirect'] = array("reports/$report_name", array('query' => Frx::parms()));
}
function forena_select_block_list($report_name, $action='add-data', $id='') {
......
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