Merge branch 'master' of github.com:easysoft/zentaopms

2016-04-18 10:07:25 +08:00
parent 619e9220ca 6f8224ba0c
commit dc33dbb5d6
35 changed files with 341 additions and 87 deletions
@@ -528,7 +528,7 @@ class block extends control
    {
        $this->app->loadLang('build');
        $projects = $this->loadModel('project')->getPairs();
-        $this->view->builds = $this->dao->select('t1.*,t2.productName')->from(TABLE_BUILD)->alias('t1')
+        $this->view->builds = $this->dao->select('t1.*, t2.name as productName')->from(TABLE_BUILD)->alias('t1')
            ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product=t2.id')
            ->where('t1.deleted')->eq('0')
            ->andWhere('t1.project')->in(array_keys($projects))