diff --git a/module/execution/ui/task.html.php b/module/execution/ui/task.html.php index ea9e1def03..3f3018c106 100644 --- a/module/execution/ui/task.html.php +++ b/module/execution/ui/task.html.php @@ -62,6 +62,8 @@ foreach($tableData as $task) { $task->rawStatus = $task->status; $task->status = $this->processStatus('task', $task); + $task->rawStory = $task->story; + $task->story = $task->storyTitle; if(helper::isZeroDate($task->deadline)) $task->deadline = ''; if(helper::isZeroDate($task->estStarted)) $task->estStarted = ''; } diff --git a/module/task/config/dtable.php b/module/task/config/dtable.php index 8b925ea902..5f9f65c536 100644 --- a/module/task/config/dtable.php +++ b/module/task/config/dtable.php @@ -165,15 +165,15 @@ $config->task->dtable->fieldList['activatedDate']['type'] = 'date'; $config->task->dtable->fieldList['activatedDate']['sortType'] = true; $config->task->dtable->fieldList['activatedDate']['group'] = 8; -$config->task->dtable->fieldList['storyTitle']['title'] = $lang->task->storyAB; -$config->task->dtable->fieldList['storyTitle']['name'] = 'storyTitle'; -$config->task->dtable->fieldList['storyTitle']['type'] = 'desc'; -$config->task->dtable->fieldList['storyTitle']['sortType'] = true; -$config->task->dtable->fieldList['storyTitle']['show'] = true; -$config->task->dtable->fieldList['storyTitle']['group'] = 9; -$config->task->dtable->fieldList['storyTitle']['link'] = array('url' => array('module' => 'story', 'method' => 'view', 'params' => 'id={story}'), 'className' => 'text-inherit'); -$config->task->dtable->fieldList['storyTitle']['dataSource'] = array('module' => 'story', 'method' => 'getExecutionStoryPairs', 'params' => ['executionID' => '$executionID', 'productID' => 0, 'branch' => 'all', 'moduleIdList' => '', 'type' => '', 'status' => 'active']); -$config->task->dtable->fieldList['storyTitle']['data-app'] = $app->tab; +$config->task->dtable->fieldList['story']['title'] = $lang->task->storyAB; +$config->task->dtable->fieldList['story']['name'] = 'story'; +$config->task->dtable->fieldList['story']['type'] = 'desc'; +$config->task->dtable->fieldList['story']['sortType'] = true; +$config->task->dtable->fieldList['story']['show'] = true; +$config->task->dtable->fieldList['story']['group'] = 9; +$config->task->dtable->fieldList['story']['link'] = array('url' => array('module' => 'story', 'method' => 'view', 'params' => 'id={rawStory}'), 'className' => 'text-inherit'); +$config->task->dtable->fieldList['story']['dataSource'] = array('module' => 'story', 'method' => 'getExecutionStoryPairs', 'params' => ['executionID' => '$executionID', 'productID' => 0, 'branch' => 'all', 'moduleIdList' => '', 'type' => '', 'status' => 'active']); +$config->task->dtable->fieldList['story']['data-app'] = $app->tab; $config->task->dtable->fieldList['module']['title'] = 'module'; $config->task->dtable->fieldList['module']['control'] = 'select';