resolve conflict

2022-12-06 17:21:18 +08:00
parent 4cbf1397b8 a1ab91b66b
commit a228bfdeeb
37 changed files with 239 additions and 189 deletions
@@ -335,6 +335,7 @@ class build extends control
        $this->view->type         = $type;
        $this->view->bugPager     = $bugPager;
        $this->view->branchName   = $branchName;
+        $this->view->childBuilds  = empty($build->builds) ? array() : $this->dao->select('id,name,bugs,stories')->from(TABLE_BUILD)->where('id')->in($build->builds)->fetchAll();

        if($this->app->getViewType() == 'json')
        {