Commit 77310658 authored by David Metzler's avatar David Metzler
Browse files

Fixes to ensure that you can create a report after a simple forena

install with no configuration changes.
parent 00ef8958
...@@ -1949,7 +1949,7 @@ function forena_data_block_form_submit($form, &$form_state) { ...@@ -1949,7 +1949,7 @@ function forena_data_block_form_submit($form, &$form_state) {
$r->get_attributes_by_id(); $r->get_attributes_by_id();
$data = array(); $data = array();
foreach ($values['blocks'] as $block) { foreach ($values['blocks'] as $block) {
if (!$block['delete']) { if (!@$block['delete']) {
$attrs = $block; $attrs = $block;
unset($attrs['delete']); unset($attrs['delete']);
......
...@@ -147,8 +147,10 @@ function forena_install() { ...@@ -147,8 +147,10 @@ function forena_install() {
if (isset($filters['full_html'])) { if (isset($filters['full_html'])) {
variable_set('forena_input_format', 'full_html'); variable_set('forena_input_format', 'full_html');
} }
$report_path = variable_get('file_' . file_default_scheme() . '_path', conf_path() . '/files/reports');
@drupal_mkdir($report_path);
require_once 'forena.admin.inc'; require_once 'forena.admin.inc';
forena_sync_reports(); forena_sync_reports(FALSE);
} }
/** /**
......
...@@ -1328,6 +1328,7 @@ function forena_db_sync_all() { ...@@ -1328,6 +1328,7 @@ function forena_db_sync_all() {
function _forena_db_sync($base_path, $subdir='') { function _forena_db_sync($base_path, $subdir='') {
$path = rtrim($base_path . '/' . $subdir, '/'); $path = rtrim($base_path . '/' . $subdir, '/');
//Iterate through each file //Iterate through each file
$skins = array();
$d = dir($path); $d = dir($path);
if ($d) while (false !== ($rpt_file = $d->read())) { if ($d) while (false !== ($rpt_file = $d->read())) {
$src_file = trim($d->path, '/') . '/' . trim($rpt_file, '/'); $src_file = trim($d->path, '/') . '/' . trim($rpt_file, '/');
......
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