From 11f494ae0723ed48917ae56adb5f76b59b42f280 Mon Sep 17 00:00:00 2001 From: chenfeiCF Date: Thu, 1 Dec 2016 15:00:53 +0800 Subject: [PATCH] * adjuct task #2722. --- module/release/model.php | 2 +- module/release/view/view.html.php | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/module/release/model.php b/module/release/model.php index aefe92f392..d47133a334 100644 --- a/module/release/model.php +++ b/module/release/model.php @@ -23,7 +23,7 @@ class releaseModel extends model */ public function getByID($releaseID, $setImgSize = false) { - $release = $this->dao->select('t1.*, t2.id as buildID, t2.filePath, t2.scmPath, t2.name as buildName, t3.name as productName, t3.type as productType') + $release = $this->dao->select('t1.*, t2.id as buildID, t2.filePath, t2.scmPath, t2.name as buildName, t2.project, t3.name as productName, t3.type as productType') ->from(TABLE_RELEASE)->alias('t1') ->leftJoin(TABLE_BUILD)->alias('t2')->on('t1.build = t2.id') ->leftJoin(TABLE_PRODUCT)->alias('t3')->on('t1.product = t3.id') diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php index 7bbd4d3510..1f645e4b58 100644 --- a/module/release/view/view.html.php +++ b/module/release/view/view.html.php @@ -278,7 +278,9 @@ release->build;?> - createLink('build', 'view', "buildID=$release->buildID"), $release->buildName, '_blank');?> + + project) ? html::a($this->createLink('build', 'view', "buildID=$release->buildID"), $release->buildName, '_blank') : $release->buildName;?> + release->status;?>