From 80a5334c7afa6c1852281a28a53a12994d2a1f08 Mon Sep 17 00:00:00 2001 From: liugang Date: Tue, 10 Jul 2018 13:34:32 +0800 Subject: [PATCH 1/3] * Finish task #4485 --- module/build/control.php | 3 ++- module/testtask/js/create.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/module/build/control.php b/module/build/control.php index 46a3ea95eb..0f8b3730ff 100644 --- a/module/build/control.php +++ b/module/build/control.php @@ -25,6 +25,7 @@ class build extends control $buildID = $this->build->create($projectID); if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError())); $this->loadModel('action')->create('build', $buildID, 'opened'); + if(isonlybody()) die(js::closeModal('parent.parent', '', "function(){parent.parent.loadProjectBuilds($projectID);}")); $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('build', 'view', "buildID=$buildID"))); } @@ -357,7 +358,7 @@ class build extends control { if(empty($builds)) { - echo html::a($this->createLink('build', 'create', "projectID=$projectID"), $this->lang->build->create, '_blank'); + echo html::a($this->createLink('build', 'create', "projectID=$projectID", '', $onlybody = true), $this->lang->build->create, '', "data-toggle='modal' data-type='iframe'"); echo '  '; echo html::a("javascript:loadProjectBuilds($projectID)", $this->lang->refresh); } diff --git a/module/testtask/js/create.js b/module/testtask/js/create.js index 2d2f0f5c45..2a37a05d85 100755 --- a/module/testtask/js/create.js +++ b/module/testtask/js/create.js @@ -22,7 +22,7 @@ function loadProjectBuilds(projectID) selectedBuild = $('#build').val(); if(!selectedBuild) selectedBuild = 0; link = createLink('build', 'ajaxGetProjectBuilds', 'projectID=' + projectID + '&productID=' + $('#product').val() + '&varName=testTaskBuild&build=' + selectedBuild); - $('#buildBox').load(link, function(){$('#build').chosen(defaultChosenOptions);}); + $('#buildBox').load(link, function(){$('#build').chosen(window.defaultChosenOptions);}); } /** From 9387fd1a91d3ddd0c75b646c33a1c358bf16f5a6 Mon Sep 17 00:00:00 2001 From: daitingting Date: Tue, 10 Jul 2018 15:00:23 +0800 Subject: [PATCH 2/3] * Adjust codes. --- module/bug/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/bug/model.php b/module/bug/model.php index b8bc244652..7405d1673e 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -2430,7 +2430,7 @@ class bugModel extends model $canBatchResolve = common::hasPriv('bug', 'batchResolve'); $canBatchAssignTo = common::hasPriv('bug', 'batchAssignTo'); - $canBatchAction = $canBatchEdit or $canBatchConfirm or $canBatchClose or $canBatchActivate or $canBatchChangeBranch or $canBatchChangeModule or $canBatchResolve or $canBatchAssignTo or $canBatchCancel; + $canBatchAction = $canBatchEdit or $canBatchConfirm or $canBatchClose or $canBatchActivate or $canBatchChangeBranch or $canBatchChangeModule or $canBatchResolve or $canBatchAssignTo; $canView = common::hasPriv('bug', 'view'); $bugLink = inlink('view', "bugID=$bug->id"); From d048bfbedc7ebf30467f27bfe38046ce048fcc23 Mon Sep 17 00:00:00 2001 From: daitingting Date: Tue, 10 Jul 2018 15:04:00 +0800 Subject: [PATCH 3/3] * Add treeTask and treeStory in group. --- module/group/lang/resource.php | 16 ++++++++++------ module/project/lang/en.php | 2 ++ module/project/lang/zh-cn.php | 2 ++ 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index e5b4c78c5a..51361c10c7 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -337,6 +337,8 @@ $lang->resource->project->updateOrder = 'updateOrder'; $lang->resource->project->kanban = 'kanban'; $lang->resource->project->printKanban = 'printKanban'; $lang->resource->project->tree = 'tree'; +$lang->resource->project->treeTask = 'treeTask'; +$lang->resource->project->treeStory = 'treeStory'; $lang->resource->project->all = 'all'; $lang->resource->project->kanbanHideCols = 'kanbanHideCols'; $lang->resource->project->kanbanColsColor = 'kanbanColsColor'; @@ -382,12 +384,14 @@ $lang->project->methodOrder[170] = 'updateOrder'; $lang->project->methodOrder[175] = 'kanban'; $lang->project->methodOrder[180] = 'printKanban'; $lang->project->methodOrder[185] = 'tree'; -$lang->project->methodOrder[190] = 'all'; -$lang->project->methodOrder[195] = 'kanbanHideCols'; -$lang->project->methodOrder[200] = 'kanbanColsColor'; -$lang->project->methodOrder[205] = 'export'; -$lang->project->methodOrder[210] = 'storyKanban'; -$lang->project->methodOrder[215] = 'storySort'; +$lang->project->methodOrder[190] = 'tree'; +$lang->project->methodOrder[195] = 'tree'; +$lang->project->methodOrder[200] = 'all'; +$lang->project->methodOrder[205] = 'kanbanHideCols'; +$lang->project->methodOrder[210] = 'kanbanColsColor'; +$lang->project->methodOrder[215] = 'export'; +$lang->project->methodOrder[220] = 'storyKanban'; +$lang->project->methodOrder[225] = 'storySort'; /* Task. */ $lang->resource->task = new stdclass(); diff --git a/module/project/lang/en.php b/module/project/lang/en.php index 45e311efc2..93e30b51e3 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -145,6 +145,8 @@ $lang->project->importPlanStories = 'Link Story From Plan'; $lang->project->importBug = 'Import Bugs'; $lang->project->updateOrder = 'Sort'; $lang->project->tree = 'Tree'; +$lang->project->treeTask = 'Show Task'; +$lang->project->treeStory = 'Show Story'; $lang->project->storyKanban = 'Story Kanban'; $lang->project->storySort = 'Sort Story'; $lang->project->importPlanStory = '' . $lang->projectCommon . ' is created!\nDo you want to iport stories linked to the plan?'; diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index 7f44be0252..73053d872b 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -145,6 +145,8 @@ $lang->project->importPlanStories = '按计划关联需求'; $lang->project->importBug = '导入Bug'; $lang->project->updateOrder = '排序'; $lang->project->tree = '树状图'; +$lang->project->treeTask = '只看任务'; +$lang->project->treeStory = '只看需求'; $lang->project->storyKanban = '需求看板'; $lang->project->storySort = '需求排序'; $lang->project->importPlanStory = '创建' . $lang->projectCommon . '成功！\n是否导入计划关联的相关需求？';