Merge branch dev/bug-65636 of zentao/zentaopms (#11632)
This commit is contained in:
@@ -172,6 +172,7 @@ class execution extends control
|
||||
$branchGroups = $this->loadModel('branch')->getByProducts(array_keys($this->view->products));
|
||||
foreach($tasks as $task)
|
||||
{
|
||||
$task->name = htmlspecialchars_decode($task->name);
|
||||
if($task->mode == 'multi' && strpos('done,closed', $task->status) === false)
|
||||
{
|
||||
$task->assignedTo = '';
|
||||
|
||||
@@ -300,8 +300,8 @@ window.getItem = function(info)
|
||||
label = "<span class='label gray-pale rounded p-0 size-sm whitespace-nowrap'>" + childrenAB + "</span> ";
|
||||
}
|
||||
|
||||
if(label && typeof info.item.title == 'string') info.item.title = {html: label + info.item.title};
|
||||
else if(label && typeof info.item.title == 'object') info.item.title.html = label + info.item.title.html;
|
||||
if(typeof info.item.title == 'string') info.item.title = {html: info.item.title};
|
||||
if(label && typeof info.item.title == 'object') info.item.title.html = label + info.item.title.html;
|
||||
}
|
||||
|
||||
if(['story', 'epic', 'requirement', 'parentStory'].includes(info.laneInfo.type))
|
||||
|
||||
Reference in New Issue
Block a user