diff --git a/lib/zin/wg/tree/v1.php b/lib/zin/wg/tree/v1.php
index b3d8eac0dd..cc94b9a01b 100644
--- a/lib/zin/wg/tree/v1.php
+++ b/lib/zin/wg/tree/v1.php
@@ -6,6 +6,6 @@ class tree extends wg
{
protected function build(): zui
{
- return zui::echarts(set::_tag('ul'), inherit($this));
+ return zui::tree(set::_tag('ul'), inherit($this));
}
}
diff --git a/module/execution/model.php b/module/execution/model.php
index ea94bac59f..f6673ad5e5 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -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' => "
{$label}{$tree->id}" . $tree->title . ' ' . (empty($tree->assignedTo) ? $tree->openedBy : $tree->assignedTo) . '
',
);
@@ -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' => "{$this->lang->story->common}{$tree->storyId}{$tree->title} " . (empty($tree->assignedTo) ? $tree->openedBy : $tree->assignedTo) . "
",
);
@@ -4449,7 +4449,7 @@ class executionModel extends model
if(isset($tree->children))
{
if($tree->type == 'task') $treeData[$index]['content']['html'] = "{$tree->title}
";
- $treeData[$index]['children'] = $this->buildTree($tree->children, $hasProduct);
+ $treeData[$index]['items'] = $this->buildTree($tree->children, $hasProduct);
}
}
return $treeData;