diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php index 1aad7582a6..7ee7f5d3e9 100644 --- a/module/execution/lang/de.php +++ b/module/execution/lang/de.php @@ -139,6 +139,7 @@ $lang->execution->kanbanNoLinkProduct = "Kanban not linked {$lang->productCommon $lang->execution->myTask = "My Task"; $lang->execution->list = "{$lang->executionCommon} List"; $lang->execution->allProject = 'All'; +$lang->execution->method = 'Method'; /* Fields of zt_team. */ $lang->execution->root = 'Root'; @@ -599,4 +600,4 @@ $lang->execution->gantt->exportFail = 'Failed to export.'; $lang->execution->boardColorList = array('#32C5FF', '#006AF1', '#9D28B2', '#FF8F26', '#7FBB00', '#424BAC', '#66c5f8', '#EC2761'); $lang->execution->linkBranchStoryByPlanTips = "When a scheduled association requirement is executed, only the active requirements associated with the %s of this execution are imported."; -$lang->execution->linkNormalStoryByPlanTips = "Only the active requirements are imported when the scheduled requirements are associated."; \ No newline at end of file +$lang->execution->linkNormalStoryByPlanTips = "Only the active requirements are imported when the scheduled requirements are associated."; diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php index 412c0c9f74..38ed9d0340 100644 --- a/module/execution/lang/en.php +++ b/module/execution/lang/en.php @@ -139,6 +139,7 @@ $lang->execution->kanbanNoLinkProduct = "Kanban not linked {$lang->productCommon $lang->execution->myTask = "My Task"; $lang->execution->list = 'List'; $lang->execution->allProject = 'All'; +$lang->execution->method = 'Method'; /* Fields of zt_team. */ $lang->execution->root = 'Root'; @@ -599,4 +600,4 @@ $lang->execution->gantt->exportFail = 'Failed to export.'; $lang->execution->boardColorList = array('#32C5FF', '#006AF1', '#9D28B2', '#FF8F26', '#7FBB00', '#424BAC', '#66c5f8', '#EC2761'); $lang->execution->linkBranchStoryByPlanTips = "When a scheduled association requirement is executed, only the active requirements associated with the %s of this execution are imported."; -$lang->execution->linkNormalStoryByPlanTips = "Only the active requirements are imported when the scheduled requirements are associated."; \ No newline at end of file +$lang->execution->linkNormalStoryByPlanTips = "Only the active requirements are imported when the scheduled requirements are associated."; diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php index 4e87634ef9..28a1b0a0c0 100644 --- a/module/execution/lang/fr.php +++ b/module/execution/lang/fr.php @@ -139,6 +139,7 @@ $lang->execution->kanbanNoLinkProduct = "Kanban not linked {$lang->productCommon $lang->execution->myTask = "My Task"; $lang->execution->list = "{$lang->executionCommon} List"; $lang->execution->allProject = 'Tous'; +$lang->execution->method = 'Method'; /* Fields of zt_team. */ $lang->execution->root = 'Root'; @@ -599,4 +600,4 @@ $lang->execution->gantt->exportFail = 'Failed to export.'; $lang->execution->boardColorList = array('#32C5FF', '#006AF1', '#9D28B2', '#FF8F26', '#7FBB00', '#424BAC', '#66c5f8', '#EC2761'); $lang->execution->linkBranchStoryByPlanTips = "When a scheduled association requirement is executed, only the active requirements associated with the %s of this execution are imported."; -$lang->execution->linkNormalStoryByPlanTips = "Only the active requirements are imported when the scheduled requirements are associated."; \ No newline at end of file +$lang->execution->linkNormalStoryByPlanTips = "Only the active requirements are imported when the scheduled requirements are associated."; diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php index 320385aef4..dd5445a1c7 100644 --- a/module/execution/lang/zh-cn.php +++ b/module/execution/lang/zh-cn.php @@ -139,6 +139,7 @@ $lang->execution->kanbanNoLinkProduct = "看板没有关联{$lang->productCommon $lang->execution->myTask = "我的任务"; $lang->execution->list = '列表'; $lang->execution->allProject = '全部项目'; +$lang->execution->method = '方法'; /* Fields of zt_team. */ $lang->execution->root = '源ID'; @@ -599,4 +600,4 @@ $lang->execution->gantt->exportFail = '导出失败。'; $lang->execution->boardColorList = array('#32C5FF', '#006AF1', '#9D28B2', '#FF8F26', '#7FBB00', '#424BAC', '#66c5f8', '#EC2761'); $lang->execution->linkBranchStoryByPlanTips = "执行按计划关联需求时,只导入本执行所关联%s的激活状态的需求。"; -$lang->execution->linkNormalStoryByPlanTips = "执行按计划关联需求时,只导入激活状态的需求。"; \ No newline at end of file +$lang->execution->linkNormalStoryByPlanTips = "执行按计划关联需求时,只导入激活状态的需求。"; diff --git a/module/execution/view/batchedit.html.php b/module/execution/view/batchedit.html.php index 7b4aafe32a..271ccb0cd1 100755 --- a/module/execution/view/batchedit.html.php +++ b/module/execution/view/batchedit.html.php @@ -51,6 +51,9 @@ model == 'scrum'):?> execution->projectName;?> + tab == 'project' and isset($project) and $project->model == 'agileplus'):?> + execution->method;?> + execution->$name;?> setCode) or $config->setCode == 1):?> execution->$code;?> @@ -85,6 +88,9 @@ model == 'scrum'):?> project, "class='form-control picker-select' data-lastselected='{$executions[$executionID]->project}' onchange='changeProject(this, $executionID, {$executions[$executionID]->project})'");?> + tab == 'project' and isset($project)):?> + execution->typeList, $executions[$executionID]->type);?> + name, "class='form-control'");?> setCode) or $config->setCode == 1):?> code, "class='form-control'");?> diff --git a/module/execution/view/edit.html.php b/module/execution/view/edit.html.php index 54e94e7377..223b13a0d3 100644 --- a/module/execution/view/edit.html.php +++ b/module/execution/view/edit.html.php @@ -34,6 +34,11 @@ model == 'kanban'):?> id);?> + tab == 'project' and $project->model == 'agileplus'):?> + + execution->method;?> + execution->typeList, $execution->type);?> + @@ -153,7 +158,7 @@
type != 'normal' and isset($branchGroups[$product->id]);?>
'> - product->common;?> + product->common;?> type == 'stage' and !$execution->division) ? "disabled='disabled'" : '';?> id, "class='form-control chosen' $disabled onchange='loadBranches(this)' data-last='" . $product->id . "' data-type='" . $product->type . "'");?> type == 'stage' and !$execution->division) echo html::hidden("products[$i]", $product->id);?>