diff --git a/module/common/model.php b/module/common/model.php index cce8418f21..20d611015b 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -406,6 +406,9 @@ class commonModel extends model if(!isset($lang->$moduleName->menu)) {echo ""; return;} + /* Unset clearData menu when the data of pms is demo. */ + if(!isset($app->config->global->showDemoUsers) or !$app->config->global->showDemoUsers) unset($lang->admin->menu->clearData); + /* Get the sub menus of the module, and get current module and method. */ $submenus = $lang->$moduleName->menu; $currentModule = $app->getModuleName(); diff --git a/module/custom/control.php b/module/custom/control.php index 870f5a4bf2..91efeb1765 100644 --- a/module/custom/control.php +++ b/module/custom/control.php @@ -52,9 +52,9 @@ class custom extends control die(js::reload('parent')); } - $this->view->title = $this->lang->custom->common . $this->lang->colon . $this->lang->custom->story; + $this->view->title = $this->lang->custom->common . $this->lang->colon . $this->lang->$module->common; $this->view->position[] = $this->lang->custom->common; - $this->view->position[] = $this->lang->custom->$module; + $this->view->position[] = $this->lang->$module->common; $this->view->fieldList = $fieldList; $this->view->dbFields = $this->custom->getItems("lang=$currentLang,all&module=$module§ion=$field"); $this->view->field = $field; diff --git a/module/product/model.php b/module/product/model.php index 03a7c3dfad..d5cdc4093c 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -373,7 +373,8 @@ class productModel extends model ksort($roadmap); /* Get last 5 roadmap. */ - $lastKeys = array_slice(array_keys($roadmap), -5); + $lastKeys = array_slice(array_keys($roadmap), -5); + $lastRoadmap = array(); foreach($lastKeys as $key) $lastRoadmap[$key] = $roadmap[$key]; return $lastRoadmap; diff --git a/module/project/lang/en.php b/module/project/lang/en.php index ea6fdce5b2..b8b4ba65ba 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -27,6 +27,7 @@ $lang->project->status = 'Status'; $lang->project->statge = 'Stage'; $lang->project->pri = 'Priority'; $lang->project->desc = 'Desc'; +$lang->project->goal = 'Goal'; $lang->project->openedBy = 'Opened by'; $lang->project->openedDate = 'Opened date'; $lang->project->closedBy = 'Closed by'; diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index 8e491c0395..65341a62f3 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -27,6 +27,7 @@ $lang->project->status = '项目状态'; $lang->project->statge = '所处阶段'; $lang->project->pri = '优先级'; $lang->project->desc = '项目描述'; +$lang->project->goal = '项目目标'; $lang->project->openedBy = '由谁创建'; $lang->project->openedDate = '创建日期'; $lang->project->closedBy = '由谁关闭'; diff --git a/module/testtask/model.php b/module/testtask/model.php index fa2b8f9711..b8ee5d4cce 100644 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -213,6 +213,7 @@ class testtaskModel extends model if($this->post->cases == false) return; foreach($this->post->cases as $caseID) { + $row = new stdclass(); $row->task = $taskID; $row->case = $caseID; $row->version = $this->post->versions[$caseID];