Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix an error with tree.

Browse Source
This commit is contained in:
tianshujie
2023-10-16 16:32:09 +08:00
parent ed69e12d83
commit 5ccd6d2403
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
+3 -3
View File
@@ -4416,7 +4416,7 @@ class executionModel extends model
{
case 'task':
$label = $tree->parent > 0 ? $this->lang->task->children : $this->lang->task->common;
$treeData[$index]['link'] = helper::createLink('execution', 'treeTask', "taskID={$tree->id}");
$treeData[$index]['url'] = helper::createLink('execution', 'treeTask', "taskID={$tree->id}");
$treeData[$index]['content'] = array(
'html' => "<div class='tree-link'><span class='label gray-pale rounded-full'>{$label}</span><span class='ml-4'>{$tree->id}</span><span class='title ml-4 text-primary' title='{$tree->title}'>" . $tree->title . '</span> <span class="user"><i class="icon icon-person"></i> ' . (empty($tree->assignedTo) ? $tree->openedBy : $tree->assignedTo) . '</span></div>',
);
@@ -4428,7 +4428,7 @@ class executionModel extends model
break;
case 'story':
$this->app->loadLang('story');
$treeData[$index]['link'] = helper::createLink('execution', 'treeStory', "taskID={$tree->storyId}");
$treeData[$index]['url'] = helper::createLink('execution', 'treeStory', "taskID={$tree->storyId}");
$treeData[$index]['content'] = array(
'html' => "<div class='tree-link'><span class='label gray-pale rounded-full'>{$this->lang->story->common}</span><span class='ml-4'>{$tree->storyId}</span><span class='title text-primary ml-4' title='{$tree->title}'>{$tree->title}</span> <span class='user'><i class='icon icon-person'></i> " . (empty($tree->assignedTo) ? $tree->openedBy : $tree->assignedTo) . "</span></div>",
);
@@ -4449,7 +4449,7 @@ class executionModel extends model
if(isset($tree->children))
{
if($tree->type == 'task') $treeData[$index]['content']['html'] = "<div class='tree-toggle'><span class='title' title='{$tree->title}'>{$tree->title}</span></div>";
$treeData[$index]['children'] = $this->buildTree($tree->children, $hasProduct);
$treeData[$index]['items'] = $this->buildTree($tree->children, $hasProduct);
}
}
return $treeData;