diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php index b7b06240c9..c365e9ade4 100644 --- a/module/doc/lang/en.php +++ b/module/doc/lang/en.php @@ -105,12 +105,13 @@ $lang->doc->fixedMenu = 'Fix to Menu'; $lang->doc->removeMenu = 'Remove from Menu'; $lang->doc->search = 'Search'; +global $config; /* Query condition list. */ $lang->doc->allProduct = 'All' . $lang->productCommon . 's'; $lang->doc->allExecutions = 'All' . $lang->executionCommon . 's'; $lang->doc->libTypeList['product'] = $lang->productCommon . ' Library'; -$lang->doc->libTypeList['project'] = 'Project Library'; +if($config->systemMode == 'new') $lang->doc->libTypeList['project'] = 'Project Library'; $lang->doc->libTypeList['execution'] = $lang->executionCommon . ' Library'; $lang->doc->libTypeList['custom'] = 'Custom Library'; diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php index fcc67947e3..adf72ec989 100644 --- a/module/doc/lang/zh-cn.php +++ b/module/doc/lang/zh-cn.php @@ -105,12 +105,13 @@ $lang->doc->fixedMenu = '固定到菜单栏'; $lang->doc->removeMenu = '从菜单栏移除'; $lang->doc->search = '搜索'; +global $config; /* 查询条件列表 */ $lang->doc->allProduct = '所有' . $lang->productCommon; $lang->doc->allExecutions = '所有' . $lang->executionCommon; $lang->doc->libTypeList['product'] = $lang->productCommon . '文档库'; -$lang->doc->libTypeList['project'] = '项目文档库'; +if($config->systemMode == 'new') $lang->doc->libTypeList['project'] = '项目文档库'; $lang->doc->libTypeList['execution'] = $lang->executionCommon . '文档库'; $lang->doc->libTypeList['custom'] = '自定义文档库'; diff --git a/module/execution/control.php b/module/execution/control.php index ab36958f50..333563729a 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -1287,6 +1287,11 @@ class execution extends control $this->executeHooks($executionID); + if($this->app->openApp == 'doc') + { + $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('doc', 'objectLibs', "type=execution"))); + } + $planID = ''; if(isset($_POST['plans'])) { diff --git a/module/execution/model.php b/module/execution/model.php index 04b3a1fd1b..2a6c1b79de 100644 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -278,6 +278,7 @@ class executionModel extends model */ public function create($copyExecutionID = '') { + $sprintType = 'sprint'; $this->lang->execution->team = $this->lang->execution->teamname; if($this->config->systemMode == 'new') diff --git a/module/execution/view/create.html.php b/module/execution/view/create.html.php index 17685be726..3488b3a143 100644 --- a/module/execution/view/create.html.php +++ b/module/execution/view/create.html.php @@ -11,7 +11,7 @@ */ ?> -systemMode == 'new' ? $this->createLink('project', 'execution', "status=all&projectID=$projectID") : $this-> createLink('execution', 'task', 'executionID=' . $executionID);?> +systemMode == 'new' ? $this->createLink('project', 'execution', "status=all&projectID=$projectID") : $this->createLink('execution', 'task', 'executionID=' . $executionID);?>