- +
+ + $URSR):?> - - + + + + diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index d0aa0247ff..387932a369 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -122,7 +122,7 @@ $lang->project->aclList['private'] = "私有（团队成员和项目负责人、 $lang->project->storyPoint = '故事点'; $lang->project->burnByList['left'] = '按剩余工时查看'; -$lang->project->burnByList['estimate'] = "按{$lang->planCommon}工时查看"; +$lang->project->burnByList['estimate'] = "按计划工时查看"; $lang->project->burnByList['storyPoint'] = '按故事点查看'; /* 方法列表。*/ @@ -144,8 +144,8 @@ $lang->project->doc = '文档列表'; $lang->project->doclib = '文档库列表'; $lang->project->manageProducts = '关联' . $lang->productCommon; $lang->project->linkStory = "关联{$lang->projectSRCommon}"; -$lang->project->linkStoryByPlan = "按照{$lang->planCommon}关联"; -$lang->project->linkPlan = "关联{$lang->planCommon}"; +$lang->project->linkStoryByPlan = "按照计划关联"; +$lang->project->linkPlan = "关联计划"; $lang->project->unlinkStoryTasks = "未关联{$lang->projectSRCommon}任务"; $lang->project->linkedProducts = '已关联'; $lang->project->unlinkedProducts = '未关联'; @@ -174,7 +174,7 @@ $lang->project->unlinkStory = "移除{$lang->projectSRCommon}"; $lang->project->unlinkStoryAB = "移除{$lang->projectSRCommon}"; $lang->project->batchUnlinkStory = "批量移除{$lang->projectSRCommon}"; $lang->project->importTask = '转入任务'; -$lang->project->importPlanStories = "按{$lang->planCommon}关联{$lang->projectSRCommon}"; +$lang->project->importPlanStories = "按计划关联{$lang->projectSRCommon}"; $lang->project->importBug = '导入Bug'; $lang->project->updateOrder = "{$lang->projectCommon}排序"; $lang->project->tree = '树状图'; @@ -184,7 +184,7 @@ $lang->project->treeOnlyTask = '树状图只看任务'; $lang->project->treeOnlyStory = "树状图只看{$lang->projectSRCommon}"; $lang->project->storyKanban = "{$lang->projectSRCommon}看板"; $lang->project->storySort = "{$lang->projectSRCommon}排序"; -$lang->project->importPlanStory = '创建' . $lang->projectCommon . '成功！\n是否导入' . $lang->planCommon . '关联的相关' . $lang->projectSRCommon . '？'; +$lang->project->importPlanStory = '创建' . $lang->projectCommon . '成功！\n是否导入计划关联的相关' . $lang->projectSRCommon . '？'; $lang->project->iteration = '版本迭代'; $lang->project->iterationInfo = '迭代%s次'; $lang->project->viewAll = '查看所有'; @@ -227,7 +227,7 @@ $lang->project->aboveAllProduct = "以上所有{$lang->productCommon}"; $lang->project->aboveAllProject = "以上所有{$lang->projectCommon}"; /* 页面提示。*/ -$lang->project->linkStoryByPlanTips = "此操作会将所选{$lang->planCommon}下面的{$lang->projectSRCommon}全部关联到此{$lang->projectCommon}中"; +$lang->project->linkStoryByPlanTips = "此操作会将所选计划下面的{$lang->projectSRCommon}全部关联到此{$lang->projectCommon}中"; $lang->project->selectProject = "请选择{$lang->projectCommon}"; $lang->project->selectExecution = "请选择阶段/迭代/冲刺"; $lang->project->beginAndEnd = '起止时间'; From b1ecc77991ee5b30bf323b5beda1b6a3f52f327b Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Thu, 17 Dec 2020 10:34:05 +0800 Subject: [PATCH 2/9] * Modify the variables of the design module. --- module/design/control.php | 14 +++++++------- module/design/model.php | 14 +++++++------- module/design/view/create.html.php | 4 ++-- module/design/view/edit.html.php | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/module/design/control.php b/module/design/control.php index c85a751cda..40d4fff3d9 100644 --- a/module/design/control.php +++ b/module/design/control.php @@ -110,7 +110,7 @@ class design extends control $this->view->users = $this->loadModel('user')->getPairs('noclosed'); $this->view->stories = $this->loadModel('story')->getProductStoryPairs($productID); $this->view->productID = $productID; - $this->view->program = $this->loadModel('project')->getByID($this->session->PRJ); + $this->view->project = $this->loadModel('program')->getPRJByID($this->session->PRJ); $this->display(); } @@ -214,9 +214,9 @@ class design extends control $this->view->title = $this->lang->design->common . $this->lang->colon . $this->lang->design->edit; $this->view->position[] = $this->lang->design->edit; - $this->view->design = $design; - $this->view->program = $this->loadModel('project')->getByID($this->session->PRJ); - $this->view->stories = $this->loadModel('story')->getProductStoryPairs($design->product); + $this->view->design = $design; + $this->view->project = $this->loadModel('program')->getPRJByID($this->session->PRJ); + $this->view->stories = $this->loadModel('story')->getProductStoryPairs($design->product); $this->display(); } @@ -236,9 +236,9 @@ class design extends control */ public function linkCommit($designID = 0, $repoID = 0, $begin = '', $end = '', $recTotal = 0, $recPerPage = 50, $pageID = 1) { - /* Get program and date. */ - $program = $this->loadModel('project')->getByID($this->session->PRJ); - $begin = $begin ? date('Y-m-d', strtotime($begin)) : $program->begin; + /* Get project and date. */ + $project = $this->loadModel('program')->getPRJByID($this->session->PRJ); + $begin = $begin ? date('Y-m-d', strtotime($begin)) : $project->begin; $end = $end ? date('Y-m-d', strtotime($end)) : helper::today(); /* Get the repository information through the repoID. */ diff --git a/module/design/model.php b/module/design/model.php index fff8004a34..4d61aeec0b 100644 --- a/module/design/model.php +++ b/module/design/model.php @@ -292,7 +292,7 @@ class designModel extends model * Get design list. * * @param int $productID - * @param int $programID + * @param int $projectID * @param string $type all|bySearch|HLDS|DDS|DBDS|ADS * @param int $param * @param string $orderBy @@ -300,17 +300,17 @@ class designModel extends model * @access public * @return array */ - public function getList($programID = 0, $productID = 0, $type = 'all', $param = 0, $orderBy = 'id_desc', $pager = null) + public function getList($projectID = 0, $productID = 0, $type = 'all', $param = 0, $orderBy = 'id_desc', $pager = null) { if($type == 'bySearch') { - $designs = $this->getBySearch($programID, $productID, $param, $orderBy, $pager); + $designs = $this->getBySearch($projectID, $productID, $param, $orderBy, $pager); } else { $designs = $this->dao->select('*')->from(TABLE_DESIGN) ->where('deleted')->eq(0) - ->beginIF($programID)->andWhere('PRJ')->eq($programID)->fi() + ->beginIF($projectID)->andWhere('PRJ')->eq($projectID)->fi() ->beginIF($type != 'all')->andWhere('type')->in($type)->fi() ->andWhere('product')->eq($productID) ->orderBy($orderBy) @@ -341,7 +341,7 @@ class designModel extends model /** * Get designs by search. * - * @param int $programID + * @param int $projectID * @param int $productID * @param int $queryID * @param string $orderBy @@ -349,7 +349,7 @@ class designModel extends model * @access public * @return object */ - public function getBySearch($programID = 0, $productID = 0, $queryID = 0, $orderBy = 'id_desc', $pager = null) + public function getBySearch($projectID = 0, $productID = 0, $queryID = 0, $orderBy = 'id_desc', $pager = null) { if($queryID) { @@ -374,7 +374,7 @@ class designModel extends model $designs = $this->dao->select('*')->from(TABLE_DESIGN) ->where($designQuery) ->andWhere('deleted')->eq('0') - ->andWhere('PRJ')->eq($programID) + ->andWhere('PRJ')->eq($projectID) ->andWhere('product')->eq($productID) ->orderBy($orderBy) ->page($pager) diff --git a/module/design/view/create.html.php b/module/design/view/create.html.php index 38b875b48b..258cfb5dfa 100644 --- a/module/design/view/create.html.php +++ b/module/design/view/create.html.php @@ -20,14 +20,14 @@
custom->URConcept;?> custom->SRConcept;?> custom->buildin;?> custom->isDefault;?> actions;?>
custom->tipRangeList, $URSR['system'], '');?>custom->URSRCommon) echo "";?> - createLink('custom', 'deleteStoryConcept', "id=$key"), "", 'hiddenwin', 'class="btn"');?> + + createLink('custom', 'setDefaultConcept', "id=$key"), "", 'hiddenwin', "class='btn' title={$lang->custom->setDefaultConcept}");?> + createLink('custom', 'deleteStoryConcept', "id=$key"), "", 'hiddenwin', "class='btn' $disabled title={$lang->delete}");?>
- product == 'multiple'):?> + product == 'multiple'):?> - product == 'single') echo html::hidden('product', $productID);?> + product == 'single') echo html::hidden('product', $productID);?> diff --git a/module/design/view/edit.html.php b/module/design/view/edit.html.php index 883818ce93..867f7656ec 100644 --- a/module/design/view/edit.html.php +++ b/module/design/view/edit.html.php @@ -20,7 +20,7 @@
design->product;?>
design->story;?>
- product == 'multiple'):?> + product == 'multiple'):?> From 95acba9fdeb177bcc4a6f8833f54f13d6cf89fbb Mon Sep 17 00:00:00 2001 From: wangyidong Date: Thu, 17 Dec 2020 10:58:37 +0800 Subject: [PATCH 3/9] * finish task #8668. --- module/upgrade/model.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 5c8631be43..ea3a374b62 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -631,12 +631,22 @@ class upgradeModel extends model $this->appendExec('12_5_1'); case '20_0_alpha': $this->saveLogs('Execute 20_0_alpha'); + + /* Ugrade 12.x when from 20.x. */ + if(strpos($fromVersion, '20_0') === 0) + { + $this->execSQL($this->getUpgradeFile('12.4.4')); + $this->adjustPriv12_5(); + $this->appendExec('12_4_4'); + } + $this->execSQL($this->getUpgradeFile('20.0.alpha')); $this->setWork2Full(); $this->initUserView(); $this->appendExec('20_0_alpha'); case '20_0_alpha1': $this->saveLogs('Execute 20_0_alpha1'); + $this->execSQL($this->getUpgradeFile('20.0.alpha1')); $this->appendExec('20_0_alpha1'); case '20_0_beta1': From 6d61bc7129fb7797ea53fcdcae4c787e413f8f6f Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Thu, 17 Dec 2020 10:59:30 +0800 Subject: [PATCH 4/9] * Modify the variables of the group module. --- module/group/model.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/module/group/model.php b/module/group/model.php index 28bb51d9a0..c195a182de 100644 --- a/module/group/model.php +++ b/module/group/model.php @@ -103,23 +103,25 @@ class groupModel extends model /** * Get group lists. * + * @param int $projectID * @access public * @return array */ - public function getList($programID = 0) + public function getList($projectID = 0) { - return $this->dao->select('*')->from(TABLE_GROUP)->where('PRJ')->eq($programID)->orderBy('id')->fetchAll(); + return $this->dao->select('*')->from(TABLE_GROUP)->where('PRJ')->eq($projectID)->orderBy('id')->fetchAll(); } /** * Get group pairs. * + * @param int $projectID * @access public * @return array */ - public function getPairs($programID = 0) + public function getPairs($projectID = 0) { - return $this->dao->select('id, name')->from(TABLE_GROUP)->where('PRJ')->eq($programID)->orderBy('id')->fetchPairs(); + return $this->dao->select('id, name')->from(TABLE_GROUP)->where('PRJ')->eq($projectID)->orderBy('id')->fetchPairs(); } /** From 68c5c8b36073272e10a7463ab5bdcc2af05376b8 Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Thu, 17 Dec 2020 11:09:55 +0800 Subject: [PATCH 5/9] * Modify the variables of the issue module. --- module/issue/lang/de.php | 2 +- module/issue/lang/en.php | 2 +- module/issue/lang/fr.php | 2 +- module/issue/lang/vi.php | 2 +- module/issue/lang/zh-cn.php | 2 +- module/issue/lang/zh-tw.php | 2 +- module/issue/model.php | 12 ++++++------ 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/module/issue/lang/de.php b/module/issue/lang/de.php index 18a02b3eb1..85b5056d54 100644 --- a/module/issue/lang/de.php +++ b/module/issue/lang/de.php @@ -12,7 +12,7 @@ $lang->issue->common = 'Issue'; $lang->issue->browse = 'List'; $lang->issue->resolvedBy = 'Resolved By'; -$lang->issue->program = 'Linked Project'; +$lang->issue->project = 'Linked Project'; $lang->issue->title = 'Title'; $lang->issue->desc = 'Description'; $lang->issue->pri = 'Priority'; diff --git a/module/issue/lang/en.php b/module/issue/lang/en.php index 18a02b3eb1..85b5056d54 100644 --- a/module/issue/lang/en.php +++ b/module/issue/lang/en.php @@ -12,7 +12,7 @@ $lang->issue->common = 'Issue'; $lang->issue->browse = 'List'; $lang->issue->resolvedBy = 'Resolved By'; -$lang->issue->program = 'Linked Project'; +$lang->issue->project = 'Linked Project'; $lang->issue->title = 'Title'; $lang->issue->desc = 'Description'; $lang->issue->pri = 'Priority'; diff --git a/module/issue/lang/fr.php b/module/issue/lang/fr.php index 18a02b3eb1..85b5056d54 100644 --- a/module/issue/lang/fr.php +++ b/module/issue/lang/fr.php @@ -12,7 +12,7 @@ $lang->issue->common = 'Issue'; $lang->issue->browse = 'List'; $lang->issue->resolvedBy = 'Resolved By'; -$lang->issue->program = 'Linked Project'; +$lang->issue->project = 'Linked Project'; $lang->issue->title = 'Title'; $lang->issue->desc = 'Description'; $lang->issue->pri = 'Priority'; diff --git a/module/issue/lang/vi.php b/module/issue/lang/vi.php index 18a02b3eb1..85b5056d54 100644 --- a/module/issue/lang/vi.php +++ b/module/issue/lang/vi.php @@ -12,7 +12,7 @@ $lang->issue->common = 'Issue'; $lang->issue->browse = 'List'; $lang->issue->resolvedBy = 'Resolved By'; -$lang->issue->program = 'Linked Project'; +$lang->issue->project = 'Linked Project'; $lang->issue->title = 'Title'; $lang->issue->desc = 'Description'; $lang->issue->pri = 'Priority'; diff --git a/module/issue/lang/zh-cn.php b/module/issue/lang/zh-cn.php index 052c604b07..9c6e7cbc21 100644 --- a/module/issue/lang/zh-cn.php +++ b/module/issue/lang/zh-cn.php @@ -12,7 +12,7 @@ $lang->issue->common = '问题'; $lang->issue->browse = '问题列表'; $lang->issue->resolvedBy = '解决者'; -$lang->issue->program = '所属项目'; +$lang->issue->project = '所属项目'; $lang->issue->title = '标题'; $lang->issue->desc = '描述'; $lang->issue->pri = '优先级'; diff --git a/module/issue/lang/zh-tw.php b/module/issue/lang/zh-tw.php index 27b644a4fe..10c19b83b1 100644 --- a/module/issue/lang/zh-tw.php +++ b/module/issue/lang/zh-tw.php @@ -12,7 +12,7 @@ $lang->issue->common = '問題'; $lang->issue->browse = '問題列表'; $lang->issue->resolvedBy = '解決者'; -$lang->issue->program = '所屬項目'; +$lang->issue->project = '所屬項目'; $lang->issue->title = '標題'; $lang->issue->desc = '描述'; $lang->issue->pri = '優先順序'; diff --git a/module/issue/model.php b/module/issue/model.php index e130368a9b..74036b04f3 100644 --- a/module/issue/model.php +++ b/module/issue/model.php @@ -80,7 +80,7 @@ class issueModel extends model /** * Get issue list data. * - * @param int $programID + * @param int $projectID * @param string $browseType bySearch|open|assignTo|closed|suspended|canceled * @param int $queryID * @param string $orderBy @@ -88,7 +88,7 @@ class issueModel extends model * @access public * @return object */ - public function getList($programID = 0, $browseType = 'all', $queryID = 0, $orderBy = 'id_desc', $pager = null) + public function getList($projectID = 0, $browseType = 'all', $queryID = 0, $orderBy = 'id_desc', $pager = null) { $issueQuery = ''; if($browseType == 'bysearch') @@ -105,7 +105,7 @@ class issueModel extends model $issueList = $this->dao->select('*')->from(TABLE_ISSUE) ->where('deleted')->eq('0') - ->beginIF($programID)->andWhere('PRJ')->eq($programID)->fi() + ->beginIF($projectID)->andWhere('PRJ')->eq($projectID)->fi() ->beginIF($browseType == 'open')->andWhere('status')->eq('active')->fi() ->beginIF($browseType == 'assignto')->andWhere('assignedTo')->eq($this->app->user->account)->fi() ->beginIF($browseType == 'closed')->andWhere('status')->eq('closed')->fi() @@ -122,18 +122,18 @@ class issueModel extends model /** * Get the issue in the block. * - * @param int $programID + * @param int $projectID * @param string $browseType open|assignto|closed|suspended|canceled * @param int $limit * @param string $orderBy * @access public * @return array */ - public function getBlockIssues($programID = 0, $browseType = 'all', $limit = 15, $orderBy = 'id_desc') + public function getBlockIssues($projectID = 0, $browseType = 'all', $limit = 15, $orderBy = 'id_desc') { $issueList = $this->dao->select('*')->from(TABLE_ISSUE) ->where('deleted')->eq('0') - ->beginIF($programID)->andWhere('PRJ')->eq($programID)->fi() + ->beginIF($projectID)->andWhere('PRJ')->eq($projectID)->fi() ->beginIF($browseType == 'open')->andWhere('status')->eq('active')->fi() ->beginIF($browseType == 'assignto')->andWhere('assignedTo')->eq($this->app->user->account)->fi() ->beginIF($browseType == 'closed')->andWhere('status')->eq('closed')->fi() From 58faa489a173c8c600fdd39a24a6cdca0adf2953 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Thu, 17 Dec 2020 11:17:59 +0800 Subject: [PATCH 6/9] * Adjust code. --- module/action/lang/zh-cn.php | 22 ++++++------ module/bug/lang/zh-cn.php | 8 ++--- module/custom/control.php | 29 ++++++++++++++++ module/custom/lang/zh-cn.php | 1 + module/custom/model.php | 33 ++++++++++++++++-- .../custom/view/browsestoryconcept.html.php | 5 +-- module/custom/view/editstoryconcept.html.php | 34 +++++++++++++++++++ module/group/lang/resource.php | 8 +++-- module/product/lang/zh-cn.php | 6 ++-- module/product/model.php | 18 +++++++--- module/productplan/lang/zh-cn.php | 32 ++++++++--------- module/report/lang/zh-cn.php | 8 ++--- module/score/lang/zh-cn.php | 4 +-- module/story/lang/zh-cn.php | 18 +++++----- 14 files changed, 165 insertions(+), 61 deletions(-) create mode 100644 module/custom/view/editstoryconcept.html.php diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php index c2b3c26392..8a8a12e95e 100755 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -68,7 +68,7 @@ $lang->action->objectTypes['product'] = $lang->productCommon; $lang->action->objectTypes['branch'] = '分支'; $lang->action->objectTypes['story'] = $lang->productSRCommon; $lang->action->objectTypes['design'] = '设计'; -$lang->action->objectTypes['productplan'] = $lang->planCommon; +$lang->action->objectTypes['productplan'] = '计划'; $lang->action->objectTypes['release'] = '发布'; $lang->action->objectTypes['program'] = '项目集'; $lang->action->objectTypes['project'] = '项目'; @@ -191,8 +191,8 @@ $lang->action->label->fromlib = '从用例库导入'; $lang->action->label->totask = '转任务'; $lang->action->label->svncommited = '提交代码'; $lang->action->label->gitcommited = '提交代码'; -$lang->action->label->linked2plan = "关联{$lang->planCommon}"; -$lang->action->label->unlinkedfromplan = "移除{$lang->planCommon}"; +$lang->action->label->linked2plan = "关联计划"; +$lang->action->label->unlinkedfromplan = "移除计划"; $lang->action->label->changestatus = '修改状态'; $lang->action->label->marked = '编辑了'; $lang->action->label->linked2project = "关联{$lang->projectCommon}"; @@ -270,8 +270,8 @@ $lang->action->dynamicAction->product['deleted'] = '删除' . $lang->p $lang->action->dynamicAction->product['closed'] = '关闭' . $lang->productCommon; $lang->action->dynamicAction->product['undeleted'] = '还原' . $lang->productCommon; $lang->action->dynamicAction->product['hidden'] = '隐藏' . $lang->productCommon; -$lang->action->dynamicAction->productplan['opened'] = "创建{$lang->planCommon}"; -$lang->action->dynamicAction->productplan['edited'] = "编辑{$lang->planCommon}"; +$lang->action->dynamicAction->productplan['opened'] = "创建计划"; +$lang->action->dynamicAction->productplan['edited'] = "编辑计划"; $lang->action->dynamicAction->release['opened'] = '创建发布'; $lang->action->dynamicAction->release['edited'] = '编辑发布'; $lang->action->dynamicAction->release['changestatus'] = '修改发布状态'; @@ -284,8 +284,8 @@ $lang->action->dynamicAction->story['reviewed'] = "评审{$lang->prod $lang->action->dynamicAction->story['closed'] = "关闭{$lang->productSRCommon}"; $lang->action->dynamicAction->story['assigned'] = "指派{$lang->productSRCommon}"; $lang->action->dynamicAction->story['changed'] = "变更{$lang->productSRCommon}"; -$lang->action->dynamicAction->story['linked2plan'] = "{$lang->productSRCommon}关联{$lang->planCommon}"; -$lang->action->dynamicAction->story['unlinkedfromplan'] = "{$lang->planCommon}移除{$lang->productSRCommon}"; +$lang->action->dynamicAction->story['linked2plan'] = "{$lang->productSRCommon}关联计划"; +$lang->action->dynamicAction->story['unlinkedfromplan'] = "计划移除{$lang->productSRCommon}"; $lang->action->dynamicAction->story['linked2release'] = "{$lang->productSRCommon}关联发布"; $lang->action->dynamicAction->story['unlinkedfromrelease'] = "发布移除{$lang->productSRCommon}"; $lang->action->dynamicAction->story['linked2build'] = "{$lang->productSRCommon}关联版本"; @@ -350,8 +350,8 @@ $lang->action->dynamicAction->bug['deleted'] = '删除Bug'; $lang->action->dynamicAction->bug['confirmed'] = "确认{$lang->productSRCommon}变更"; $lang->action->dynamicAction->bug['tostory'] = "转{$lang->productSRCommon}"; $lang->action->dynamicAction->bug['totask'] = '转任务'; -$lang->action->dynamicAction->bug['linked2plan'] = "Bug关联{$lang->planCommon}"; -$lang->action->dynamicAction->bug['unlinkedfromplan'] = "{$lang->planCommon}移除Bug"; +$lang->action->dynamicAction->bug['linked2plan'] = "Bug关联计划"; +$lang->action->dynamicAction->bug['unlinkedfromplan'] = "计划移除Bug"; $lang->action->dynamicAction->bug['linked2release'] = 'Bug关联发布'; $lang->action->dynamicAction->bug['unlinkedfromrelease'] = '发布移除Bug'; $lang->action->dynamicAction->bug['linked2bug'] = 'Bug关联版本'; @@ -408,7 +408,7 @@ $lang->action->dynamicAction->entry['edited'] = '编辑应用'; /* 用来生成相应对象的链接。*/ $lang->action->label->product = $lang->productCommon . '|product|view|productID=%s'; -$lang->action->label->productplan = "{$lang->planCommon}|productplan|view|productID=%s"; +$lang->action->label->productplan = "计划|productplan|view|productID=%s"; $lang->action->label->release = '发布|release|view|productID=%s'; $lang->action->label->story = "{$lang->productSRCommon}|story|view|storyID=%s"; $lang->action->label->program = "项目集|program|pgmproduct|programID=%s"; @@ -453,7 +453,7 @@ $lang->action->search->objectTypeList['doclib'] = '文档库'; $lang->action->search->objectTypeList['todo'] = '待办'; $lang->action->search->objectTypeList['build'] = '版本'; $lang->action->search->objectTypeList['release'] = '发布'; -$lang->action->search->objectTypeList['productplan'] = $lang->planCommon; +$lang->action->search->objectTypeList['productplan'] = '计划'; $lang->action->search->objectTypeList['branch'] = '分支'; $lang->action->search->objectTypeList['testsuite'] = '套件'; $lang->action->search->objectTypeList['caselib'] = '公共库'; diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php index a397e11ab8..1b098f08f9 100644 --- a/module/bug/lang/zh-cn.php +++ b/module/bug/lang/zh-cn.php @@ -14,7 +14,7 @@ $lang->bug->common = 'Bug'; $lang->bug->id = 'Bug编号'; $lang->bug->product = '所属' . $lang->productCommon; $lang->bug->branch = '分支/平台'; -$lang->bug->productplan = '所属' . $lang->planCommon; +$lang->bug->productplan = '所属' . '计划'; $lang->bug->module = '所属模块'; $lang->bug->moduleAB = '模块'; $lang->bug->project = '所属' . $lang->projectCommon; @@ -58,7 +58,7 @@ $lang->bug->resolvedBuild = '解决版本'; $lang->bug->resolvedDate = '解决日期'; $lang->bug->resolvedDateAB = '解决日期'; $lang->bug->deadline = '截止日期'; -$lang->bug->plan = '所属' . $lang->planCommon; +$lang->bug->plan = '所属' . '计划'; $lang->bug->closedBy = '由谁关闭'; $lang->bug->closedDate = '关闭日期'; $lang->bug->duplicateBug = '重复ID'; @@ -373,8 +373,8 @@ $lang->bug->action = new stdclass(); $lang->bug->action->resolved = array('main' => '$date, 由 $actor 解决，方案为 $extra $appendLink。', 'extra' => 'resolutionList'); $lang->bug->action->tostory = array('main' => '$date, 由 $actor 转为 ' . $lang->projectSRCommon . '，编号为 $extra。'); $lang->bug->action->totask = array('main' => '$date, 由 $actor 导入为任务，编号为 $extra。'); -$lang->bug->action->linked2plan = array('main' => '$date, 由 $actor 关联到' . $lang->planCommon . ' $extra。'); -$lang->bug->action->unlinkedfromplan = array('main' => '$date, 由 $actor 从' . $lang->planCommon . ' $extra 移除。'); +$lang->bug->action->linked2plan = array('main' => '$date, 由 $actor 关联到计划 $extra。'); +$lang->bug->action->unlinkedfromplan = array('main' => '$date, 由 $actor 从计划 $extra 移除。'); $lang->bug->action->linked2build = array('main' => '$date, 由 $actor 关联到版本 $extra。'); $lang->bug->action->unlinkedfrombuild = array('main' => '$date, 由 $actor 从版本 $extra 移除。'); $lang->bug->action->linked2release = array('main' => '$date, 由 $actor 关联到发布 $extra。'); diff --git a/module/custom/control.php b/module/custom/control.php index 81c35b3ade..dc396613ec 100644 --- a/module/custom/control.php +++ b/module/custom/control.php @@ -441,6 +441,35 @@ class custom extends control $this->display(); } + /** + * Edit story concept. + * + * @access public + * @return void + */ + public function editStoryConcept($key = 0) + { + if($_POST) + { + $result = $this->custom->updateURAndSR($key); + if(!$result) $this->send(array('result' => 'fail', 'message' => $this->lang->custom->notice->URSREmpty)); + + if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError())); + $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent')); + } + + $lang = $this->app->getClientLang(); + $URSR = $this->dao->select('`value`')->from(TABLE_LANG) + ->where('lang')->eq($lang) + ->andWhere('module')->eq('custom') + ->andWhere('section')->eq('URSRList') + ->andWhere('`key`')->eq($key) + ->fetch('value'); + + $this->view->URSR = json_decode($URSR); + $this->display(); + } + /** * Delete story concept. * diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php index e38b1c8f6c..f49f2487d0 100644 --- a/module/custom/lang/zh-cn.php +++ b/module/custom/lang/zh-cn.php @@ -40,6 +40,7 @@ $lang->custom->scrumStory = "故事"; $lang->custom->waterfallCommon = "瀑布"; $lang->custom->buildin = "系统内置"; $lang->custom->isDefault = '是否默认'; +$lang->custom->editStoryConcept = "编辑需求概念"; $lang->custom->setStoryConcept = "设置需求概念"; $lang->custom->setDefaultConcept = "设置默认概念"; $lang->custom->browseStoryConcept = "需求概念列表"; diff --git a/module/custom/model.php b/module/custom/model.php index 1566c4e82d..bd2267cfde 100644 --- a/module/custom/model.php +++ b/module/custom/model.php @@ -482,7 +482,7 @@ class customModel extends model foreach($this->lang->custom->URSRList as $key => $content) { $content = json_decode($content); - $URSRPairs[$key] = $content->SRName . '/' . $content->URName; + $URSRPairs[$key] = $content->URName . '/' . $content->SRName; } return $URSRPairs; @@ -614,7 +614,7 @@ class customModel extends model } /** - * Set ur and SR concept. + * Set UR and SR concept. * * @access public * @return bool @@ -650,6 +650,35 @@ class customModel extends model return true; } + /** + * Edit UR and SR concept. + * + * @param int $key + * @access public + * @return bool + */ + public function updateURAndSR($key = 0) + { + $lang = $this->app->getClientLang(); + $data = fixer::input('post')->get(); + + if(!$data->SRName || !$data->URName) return false; + + $URSRList = new stdclass(); + $URSRList->SRName = $data->SRName; + $URSRList->URName = $data->URName; + + $value = json_encode($URSRList); + $this->dao->update(TABLE_LANG)->set('value')->eq($value) + ->where('`key`')->eq($key) + ->andWhere('section')->eq('URSRList') + ->andWhere('lang')->eq($lang) + ->andWhere('module')->eq('custom') + ->exec(); + + return true; + } + /** * Set story or requirement. * diff --git a/module/custom/view/browsestoryconcept.html.php b/module/custom/view/browsestoryconcept.html.php index 0fdc4f766a..acf7922644 100644 --- a/module/custom/view/browsestoryconcept.html.php +++ b/module/custom/view/browsestoryconcept.html.php @@ -15,7 +15,7 @@
@@ -36,7 +36,8 @@
diff --git a/module/custom/view/editstoryconcept.html.php b/module/custom/view/editstoryconcept.html.php new file mode 100644 index 0000000000..c40d4397bf --- /dev/null +++ b/module/custom/view/editstoryconcept.html.php @@ -0,0 +1,34 @@ + + * @package ZenTaoPMS + * @version $Id: setstoryconcept.html.php 4129 2020-09-01 01:58:14Z sgm $ + */ +?> + +
+ +
+
design->product;?> product, "class='form-control chosen'");?>custom->URSRCommon) echo "";?> - createLink('custom', 'setDefaultConcept', "id=$key"), "", 'hiddenwin', "class='btn' title={$lang->custom->setDefaultConcept}");?> + createLink('custom', 'setDefaultConcept', "id=$key"), "", 'hiddenwin', "class='btn' title={$lang->custom->setDefaultConcept}");?> + createLink('custom', 'editStoryConcept', "id=$key", '', true), "", '', "class='btn iframe' title={$lang->edit}");?> createLink('custom', 'deleteStoryConcept', "id=$key"), "", 'hiddenwin', "class='btn' $disabled title={$lang->delete}");?>
+ + + + + + + + + + + +
custom->URConcept;?> + custom->SRConcept;?> +
URName, "class='form-control'");?>SRName, "class='form-control'");?>
+