diff --git a/lib/zin/wg/gantt/js/v1.js b/lib/zin/wg/gantt/js/v1.js index 1ae73b5c38..3167740a43 100644 --- a/lib/zin/wg/gantt/js/v1.js +++ b/lib/zin/wg/gantt/js/v1.js @@ -403,7 +403,7 @@ function initGantt() gantt.config.details_on_create = false; gantt.config.duration_unit = "day"; setScalesByZoom(zooming); - if(!showChart) gantt.config.show_chart = false; + gantt.config.show_chart = showChart; gantt.config.columns = []; gantt.config.columns.push({name: 'text', width: '*', tree: true, resize: true, min_width:120, width:200}); diff --git a/module/programplan/ui/gantt.html.php b/module/programplan/ui/gantt.html.php index 63ee56fdbc..859543a84b 100644 --- a/module/programplan/ui/gantt.html.php +++ b/module/programplan/ui/gantt.html.php @@ -65,5 +65,6 @@ gantt set('canEdit', common::hasPriv('programplan', 'ganttEdit')), set('canEditDeadline', common::hasPriv('review', 'edit')), set('zooming', isset($zooming) ? $zooming : 'day'), + set('showChart', !$dateDetails), set('options', $plans) ); diff --git a/module/programplan/zen.php b/module/programplan/zen.php index d7f6659832..c677f9a235 100644 --- a/module/programplan/zen.php +++ b/module/programplan/zen.php @@ -366,7 +366,7 @@ class programplanZen extends programplan $module = 'programplan'; if(!isset($this->config->programplan->browse->stageCustom)) $this->loadModel('setting')->setItem("$owner.$module.browse.stageCustom", 'date,task,point'); $selectCustom = $this->loadModel('setting')->getItem("owner={$owner}&module=programplan§ion=browse&key=stageCustom"); - $dateDetails = strpos($selectCustom, 'date') !== false ? 0 : 1; // Gantt chart detail date display. + $dateDetails = strpos($selectCustom, 'date') !== false ? false : true; // Gantt chart detail date display. foreach(explode(',', $this->config->programplan->custom->customGanttFields) as $field) $customFields[$field] = $this->lang->programplan->ganttCustom[$field]; $this->view->customFields = $customFields;