diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php index 1327985178..a0240f1e52 100644 --- a/module/common/lang/menu.php +++ b/module/common/lang/menu.php @@ -320,6 +320,9 @@ $lang->execution->menu->task = array('link' => "{$lang->task->common}|execut $lang->execution->menu->kanban = array('link' => "$lang->executionKanban|execution|taskkanban|executionID=%s"); $lang->execution->menu->burn = array('link' => "$lang->burn|execution|burn|executionID=%s"); $lang->execution->menu->view = array('link' => "$lang->view|execution|grouptask|executionID=%s", 'alias' => 'grouptask,tree,taskeffort,gantt,calendar,relation,maintainrelation'); + +if($this->config->edition != 'open') $lang->execution->menu->view = array('link' => "$lang->view|execution|gantt|executionID=%s", 'alias' => 'grouptask,tree,taskeffort,gantt,calendar,relation,maintainrelation'); + $lang->execution->menu->story = array('link' => "$lang->SRCommon|execution|story|executionID=%s", 'subModule' => 'story', 'alias' => 'batchcreate,linkstory,storykanban,batchtotask'); $lang->execution->menu->qa = array('link' => "{$lang->qa->common}|execution|bug|executionID=%s", 'subModule' => 'bug,testcase,testtask,testreport', 'alias' => 'qa,bug,testcase,testtask,testreport'); $lang->execution->menu->devops = array('link' => "{$lang->repo->common}|repo|browse|repoID=0&branchID=&objectID=%s", 'subModule' => 'repo'); diff --git a/module/port/model.php b/module/port/model.php index c42ec99268..55b0e52e16 100644 --- a/module/port/model.php +++ b/module/port/model.php @@ -479,7 +479,7 @@ class portModel extends model { $getParams = $this->session->{$model . 'PortParams'}; - if($params) + if($params and $getParams) { $params = explode('&', $params); foreach($params as $param => $value) @@ -1305,7 +1305,7 @@ class portModel extends model elseif($field == 'estimate') { $html .= ''; - if(is_array($object->estimate)) + if(!empty($object->estimate) and is_array($object->estimate)) { $html .= ""; foreach($object->estimate as $account => $estimate) diff --git a/module/programplan/view/gantt.html.php b/module/programplan/view/gantt.html.php index cd90dcc682..11e683f4d8 100644 --- a/module/programplan/view/gantt.html.php +++ b/module/programplan/view/gantt.html.php @@ -94,7 +94,9 @@ form {display: block; margin-top: 0em; margin-block-end: 1em;}