diff --git a/module/release/css/browse.css b/module/release/css/browse.css index 8c33b9fd78..dd6d856b51 100644 --- a/module/release/css/browse.css +++ b/module/release/css/browse.css @@ -1,5 +1,6 @@ #releaseList {font-size: 13px;} td {overflow: hidden; text-overflow: ellipsis; white-space: nowrap;} +#releaseList tbody>tr:hover{background-color: unset!important;} .main-table tbody>tr>td:first-child{padding: 2px 8px!important;} .c-id {width: 60px} diff --git a/module/release/model.php b/module/release/model.php index 92d8aaa8d4..db12c0f417 100644 --- a/module/release/model.php +++ b/module/release/model.php @@ -31,7 +31,7 @@ class releaseModel extends model ->fetch(); if(!$release) return false; - $release->builds = $this->dao->select('id, filePath, scmPath, name, project')->from(TABLE_BUILD)->where('id')->in($release->build)->fetchAll(); + $release->builds = $this->dao->select('id, filePath, scmPath, name, execution, project')->from(TABLE_BUILD)->where('id')->in($release->build)->fetchAll(); $this->loadModel('file'); $release = $this->file->replaceImgURL($release, 'desc'); @@ -66,7 +66,7 @@ class releaseModel extends model ->page($pager) ->fetchAll(); - $builds = $this->dao->select("t1.id, t1.name, IF(t2.name IS NOT NULL, t2.name, '') AS projectName, IF(t3.name IS NOT NULL, t3.name, '{$this->lang->trunk}') AS branchName") + $builds = $this->dao->select("t1.id, t1.name, t1.execution, IF(t2.name IS NOT NULL, t2.name, '') AS projectName, IF(t3.name IS NOT NULL, t3.name, '{$this->lang->trunk}') AS branchName") ->from(TABLE_BUILD)->alias('t1') ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id') ->leftJoin(TABLE_BRANCH)->alias('t3')->on('t1.branch = t3.id') diff --git a/module/release/view/browse.html.php b/module/release/view/browse.html.php index 5552c7eb28..3162da013b 100644 --- a/module/release/view/browse.html.php +++ b/module/release/view/browse.html.php @@ -52,7 +52,7 @@