From 44c7bcbd59d443e12668a1674aec08e35d02e2ec Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Wed, 16 Dec 2020 14:46:05 +0800 Subject: [PATCH] * Finish task #8678. --- module/project/lang/en.php | 2 +- module/project/lang/zh-cn.php | 2 +- module/todo/js/view.js | 20 ++++++++-------- module/todo/lang/en.php | 3 +++ module/todo/lang/zh-cn.php | 3 +++ module/todo/view/view.html.php | 44 ++++++++++++++++++++-------------- 6 files changed, 44 insertions(+), 30 deletions(-) diff --git a/module/project/lang/en.php b/module/project/lang/en.php index e3e10e4763..1668da75fe 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -229,7 +229,7 @@ $lang->project->aboveAllProject = "All the above {$lang->projectCommon}s"; /* Page prompt. */ $lang->project->linkStoryByPlanTips = "This action will link all stories in this plan to the {$lang->projectCommon}."; $lang->project->selectProject = "Select {$lang->projectCommon}"; -$lang->project->selectExecution = "Select Execution"; +$lang->project->selectExecution = "Select Stage/" . $lang->projectCommon; $lang->project->beginAndEnd = 'Duration'; $lang->project->begin = 'Begin'; $lang->project->end = 'End'; diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index d2f965f839..197823602e 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -229,7 +229,7 @@ $lang->project->aboveAllProject = "以上所有{$lang->projectCommon}"; /* 页面提示。*/ $lang->project->linkStoryByPlanTips = "此操作会将所选{$lang->planCommon}下面的{$lang->projectSRCommon}全部关联到此{$lang->projectCommon}中"; $lang->project->selectProject = "请选择{$lang->projectCommon}"; -$lang->project->selectExecution = "请选择执行"; +$lang->project->selectExecution = "请选择阶段/" . $lang->projectCommon; $lang->project->beginAndEnd = '起止时间'; $lang->project->begin = '开始日期'; $lang->project->end = '截止日期'; diff --git a/module/todo/js/view.js b/module/todo/js/view.js index bfc2bdbcf2..db4fc46413 100644 --- a/module/todo/js/view.js +++ b/module/todo/js/view.js @@ -14,25 +14,25 @@ $(function() $('#toTaskButton').click(function() { - var executionID = $(this).closest('.input-group').find('#execution').val(); + var executionID = $('#execution').val(); if(!executionID) { alert(selectExecution); return false; } - var onlybody = config.onlybody; - var projectID = $('#project').val(); - var link = createLink('task', 'create', 'projectID=' + executionID + '&storyID=0&moduleID=0&taskID=0&todoID=' + todoID, config.defaultView, 'no', projectID); + var onlybody = config.onlybody; + var projectID = $('#project').val(); + var link = createLink('task', 'create', 'projectID=' + executionID + '&storyID=0&moduleID=0&taskID=0&todoID=' + todoID, config.defaultView, 'no', projectID); parent.location.href = link; }) $('#toStoryButton').click(function() { - var onlybody = config.onlybody; - var programID = $('#productProgram').val(); + var onlybody = config.onlybody; + var programID = $('#productProgram').val(); - var productID = $(this).closest('.input-group').find('#product').val(); + var productID = $('#product').val(); var link = createLink('story', 'create', 'productID=' + productID + '&branch=0&moduleID=0&storyID=0&projectID=0&bugID=0&planID=0&todoID=' + todoID, config.defaultView, 'no', programID); parent.location.href = link; @@ -40,10 +40,10 @@ $(function() $('#toBugButton').click(function() { - var onlybody = config.onlybody; - var programID = $('#project').val(); + var onlybody = config.onlybody; + var programID = $('#project').val(); - var productID = $(this).closest('.input-group').find('#product').val(); + var productID = $('#product').val(); var link = createLink('bug', 'create', 'productID=' + productID + '&branch=0&extras=todoID=' + todoID, config.defaultView, 'no', programID); parent.location.href = link; diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php index 7be4149a08..59aa59ef99 100644 --- a/module/todo/lang/en.php +++ b/module/todo/lang/en.php @@ -33,6 +33,9 @@ $lang->todo->import = "Import"; $lang->todo->legendBasic = "Basic Info"; $lang->todo->cycle = "Recur"; $lang->todo->cycleConfig = "Recurrence"; +$lang->todo->project = "Project"; +$lang->todo->product = "Product"; +$lang->todo->execution = "Stage/" . $lang->projectCommon; $lang->todo->reasonList['story'] = "Convert to Story"; $lang->todo->reasonList['task'] = "Convert to Task"; diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php index 00e669ec21..781a00f62d 100644 --- a/module/todo/lang/zh-cn.php +++ b/module/todo/lang/zh-cn.php @@ -33,6 +33,9 @@ $lang->todo->import = "导入"; $lang->todo->legendBasic = "基本信息"; $lang->todo->cycle = "周期"; $lang->todo->cycleConfig = "周期设置"; +$lang->todo->project = "所属项目"; +$lang->todo->product = "所属产品"; +$lang->todo->execution = "所属阶段/" . $lang->projectCommon; $lang->todo->reasonList['story'] = "转{$lang->productSRCommon}"; $lang->todo->reasonList['task'] = "转任务"; diff --git a/module/todo/view/view.html.php b/module/todo/view/view.html.php index 5963be4695..5c2a1df931 100644 --- a/module/todo/view/view.html.php +++ b/module/todo/view/view.html.php @@ -198,15 +198,19 @@

-
- - - - - - - todo->reasonList['task'], "id='toTaskButton'", 'btn btn-primary');?> -
+ + + + + + + + + + + + +
todo->project;?>
todo->execution;?>
todo->reasonList['task'], "id='toTaskButton'", 'btn btn-primary');?>
@@ -254,15 +258,19 @@

-
- - - - - - - todo->reasonList['bug'], "id='toBugButton'", 'btn btn-primary');?> -
+ + + + + + + + + + + + +
todo->project;?>
todo->product;?>
todo->reasonList['bug'], "id='toBugButton'", 'btn btn-primary');?>