* adjust for project tree.

This commit is contained in:
wangyidong
2017-01-16 15:13:44 +08:00
parent 8af5e74ad4
commit c6e6d9e1a5
2 changed files with 2 additions and 5 deletions
+1 -4
View File
@@ -1269,10 +1269,7 @@ class project extends control
$this->app->session->set('storyList', $uri);
$this->app->session->set('projectList', $uri);
if($type === 'json')
{
die(json_encode($tree, JSON_HEX_QUOT | JSON_HEX_APOS));
}
if($type === 'json') die(helper::jsonEncode4Parse($tree, JSON_HEX_QUOT | JSON_HEX_APOS));
$this->view->title = $this->lang->project->tree;
$this->view->position[] = html::a($this->createLink('project', 'browse', "projectID=$projectID"), $project->name);
+1 -1
View File
@@ -2361,6 +2361,6 @@ class projectModel extends model
}
}
if(empty($fullTrees[0]->children)) array_shift($fullTrees);
return $fullTrees;
return array_values($fullTrees);
}
}