From e99071291be742960007e5d8b384fd13a4b4524d Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Fri, 9 Apr 2021 11:30:21 +0300 Subject: [PATCH 1/6] * Fix bug#11925. --- module/doc/js/createlib.js | 1 + 1 file changed, 1 insertion(+) diff --git a/module/doc/js/createlib.js b/module/doc/js/createlib.js index 1af8868b9f..9867c1de4e 100644 --- a/module/doc/js/createlib.js +++ b/module/doc/js/createlib.js @@ -74,6 +74,7 @@ function changeByLibType(libType) var acl = $('form [name=acl]').val(); var notice = typeof(noticeAcl[libType][acl]) != 'undefined' ? noticeAcl[libType][acl] : ''; $('#noticeAcl').html(notice); + $('#whiteListBox').addClass('hidden'); } function changeDoclibAcl(libType) From e3573e9627506525c782ef2376cd04765f153f99 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Fri, 9 Apr 2021 16:34:23 +0800 Subject: [PATCH 2/6] * Fix en lang. --- module/common/lang/en.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/module/common/lang/en.php b/module/common/lang/en.php index ad78f5a4e1..a236f17cb2 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -210,13 +210,14 @@ $lang->project->list = 'Project List'; $lang->execution->list = "{$lang->executionCommon} List"; -$lang->doc->recent = 'Recent'; -$lang->doc->my = 'My'; -$lang->doc->favorite = 'Favorite'; -$lang->doc->product = 'Product'; -$lang->doc->project = 'Project'; -$lang->doc->custom = 'Custom'; -$lang->doc->wiki = 'WIKI'; +$lang->doc->recent = 'Recent'; +$lang->doc->my = 'My'; +$lang->doc->favorite = 'Favorite'; +$lang->doc->product = 'Product'; +$lang->doc->project = 'Project'; +$lang->doc->execution = $lang->executionCommon; +$lang->doc->custom = 'Custom'; +$lang->doc->wiki = 'WIKI'; $lang->product->list = $lang->productCommon . ' List'; From edd482504518b47d0f2298f15d3991676930eceb Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Fri, 9 Apr 2021 16:34:26 +0800 Subject: [PATCH 3/6] * Fix bug #11934. --- module/execution/control.php | 5 +++++ module/execution/model.php | 1 + module/execution/view/create.html.php | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) 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);?>