diff --git a/module/chart/lang/de.php b/module/chart/lang/de.php index dfbb0c6642..65b1d63669 100644 --- a/module/chart/lang/de.php +++ b/module/chart/lang/de.php @@ -36,7 +36,7 @@ $lang->chart->typeList = array(); $lang->chart->typeList['pie'] = 'Pie'; $lang->chart->typeList['line'] = 'Line'; $lang->chart->typeList['radar'] = 'Radar'; -$lang->chart->typeList['cluBarY'] = 'clustered Bar Y'; -$lang->chart->typeList['stackedBarY'] = 'stacked Bar Y'; -$lang->chart->typeList['cluBarX'] = 'clustered Bar X'; -$lang->chart->typeList['stackedBar'] = 'stacked Bar'; +$lang->chart->typeList['cluBarY'] = 'Clustered Bar Y'; +$lang->chart->typeList['stackedBarY'] = 'Stacked Bar Y'; +$lang->chart->typeList['cluBarX'] = 'Clustered Bar X'; +$lang->chart->typeList['stackedBar'] = 'Stacked Bar'; diff --git a/module/chart/lang/en.php b/module/chart/lang/en.php index dfbb0c6642..65b1d63669 100644 --- a/module/chart/lang/en.php +++ b/module/chart/lang/en.php @@ -36,7 +36,7 @@ $lang->chart->typeList = array(); $lang->chart->typeList['pie'] = 'Pie'; $lang->chart->typeList['line'] = 'Line'; $lang->chart->typeList['radar'] = 'Radar'; -$lang->chart->typeList['cluBarY'] = 'clustered Bar Y'; -$lang->chart->typeList['stackedBarY'] = 'stacked Bar Y'; -$lang->chart->typeList['cluBarX'] = 'clustered Bar X'; -$lang->chart->typeList['stackedBar'] = 'stacked Bar'; +$lang->chart->typeList['cluBarY'] = 'Clustered Bar Y'; +$lang->chart->typeList['stackedBarY'] = 'Stacked Bar Y'; +$lang->chart->typeList['cluBarX'] = 'Clustered Bar X'; +$lang->chart->typeList['stackedBar'] = 'Stacked Bar'; diff --git a/module/chart/lang/fr.php b/module/chart/lang/fr.php index dfbb0c6642..65b1d63669 100644 --- a/module/chart/lang/fr.php +++ b/module/chart/lang/fr.php @@ -36,7 +36,7 @@ $lang->chart->typeList = array(); $lang->chart->typeList['pie'] = 'Pie'; $lang->chart->typeList['line'] = 'Line'; $lang->chart->typeList['radar'] = 'Radar'; -$lang->chart->typeList['cluBarY'] = 'clustered Bar Y'; -$lang->chart->typeList['stackedBarY'] = 'stacked Bar Y'; -$lang->chart->typeList['cluBarX'] = 'clustered Bar X'; -$lang->chart->typeList['stackedBar'] = 'stacked Bar'; +$lang->chart->typeList['cluBarY'] = 'Clustered Bar Y'; +$lang->chart->typeList['stackedBarY'] = 'Stacked Bar Y'; +$lang->chart->typeList['cluBarX'] = 'Clustered Bar X'; +$lang->chart->typeList['stackedBar'] = 'Stacked Bar'; diff --git a/module/chart/model.php b/module/chart/model.php index 4495d5a0e1..5dd1919c42 100644 --- a/module/chart/model.php +++ b/module/chart/model.php @@ -72,7 +72,7 @@ class chartModel extends model if(!empty($chart->sql)) $chart->sql = trim(str_replace(';', '', $chart->sql)); if(!empty($chart->settings)) $chart->settings = json_decode($chart->settings, true); - if(!empty($chart->settings) and is_array($chart->settings)) + if(empty($chart->type) and !empty($chart->settings) and is_array($chart->settings)) { $firstSetting = current($chart->settings); if(isset($firstSetting['type'])) $chart->type = $firstSetting['type'];