diff --git a/module/execution/control.php b/module/execution/control.php index a0327c24cb..45d43b123c 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -180,6 +180,7 @@ class execution extends control } } if(isset($branchGroups[$task->product][$task->branch])) $task->branch = $branchGroups[$task->product][$task->branch]; + if($task->needConfirm) $task->status = 'changed'; } $showAllModule = empty($this->config->execution->task->allModule) ? '' : 'allModule'; diff --git a/module/task/config/dtable.php b/module/task/config/dtable.php index 336a8e8d13..06289c22a2 100644 --- a/module/task/config/dtable.php +++ b/module/task/config/dtable.php @@ -25,7 +25,7 @@ $config->task->dtable->fieldList['pri']['group'] = 1; $config->task->dtable->fieldList['status']['title'] = $lang->statusAB; $config->task->dtable->fieldList['status']['type'] = 'status'; -$config->task->dtable->fieldList['status']['statusMap'] = $lang->task->statusList; +$config->task->dtable->fieldList['status']['statusMap'] = $lang->task->statusList + array('changed' => $lang->task->storyChange); $config->task->dtable->fieldList['status']['sortType'] = true; $config->task->dtable->fieldList['status']['show'] = true; $config->task->dtable->fieldList['status']['group'] = 1;