* Fix bug #48759.
This commit is contained in:
@@ -74,6 +74,11 @@ class taskBasicInfo extends wg
|
||||
'items' => $this->getModuleItems($task, $product)
|
||||
);
|
||||
|
||||
if($config->edition == 'max' && $execution->type == 'stage')
|
||||
{
|
||||
$items[$lang->task->design] = array('control' => 'text', 'text' => $task->designName, 'title' => $task->designName, 'control' => 'link', 'url' => createLink('design', 'view', "designID=$task->design"));
|
||||
}
|
||||
|
||||
$items[$lang->task->fromBug] = array
|
||||
(
|
||||
'control' => 'entityTitle',
|
||||
|
||||
@@ -152,6 +152,11 @@ window.renderCell = function(result, info)
|
||||
}
|
||||
|
||||
if(['estimate', 'consumed','left'].includes(info.col.name) && result) result[0] = {html: result[0] + ' h'};
|
||||
if(info.col.name == 'design')
|
||||
{
|
||||
result[0] = {html: task.designName};
|
||||
result[1].attrs['title'] = task.designName;
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -52,6 +52,7 @@ if(common::canModify('execution', $execution))
|
||||
|
||||
$cols = $this->loadModel('datatable')->getSetting('execution');
|
||||
if($execution->type != 'stage') unset($cols['design']);
|
||||
|
||||
$tableData = initTableData($tasks, $cols, $this->task);
|
||||
$tableData = array_map(
|
||||
function($task)
|
||||
|
||||
@@ -191,9 +191,8 @@ $config->task->dtable->fieldList['mailto']['delimiter'] = ',';
|
||||
|
||||
if($config->edition == 'max')
|
||||
{
|
||||
$config->task->dtable->fieldList['design']['title'] = $lang->task->design;
|
||||
$config->task->dtable->fieldList['design']['type'] = 'text';
|
||||
$config->task->dtable->fieldList['design']['dataSource'] = array('module' => 'story', 'method' => 'getDesignPairs', 'params' => ['projectID' => 0, 'storyID' => 0]);
|
||||
$config->task->dtable->fieldList['design']['title'] = $lang->task->design;
|
||||
$config->task->dtable->fieldList['design']['type'] = 'text';
|
||||
}
|
||||
|
||||
$config->task->dtable->fieldList['actions']['type'] = 'actions';
|
||||
|
||||
Reference in New Issue
Block a user