diff --git a/module/projectrelease/js/browse.js b/module/projectrelease/js/browse.js index 215487f727..8b8ddb4f34 100644 --- a/module/projectrelease/js/browse.js +++ b/module/projectrelease/js/browse.js @@ -3,24 +3,28 @@ $(function() /* Update table summary text. */ var $rows = $('#releaseList').find('tbody>tr'); + var total = 0; var normal = 0; var terminate = 0; $rows.each(function() { var $row = $(this); + if($row.find('.c-id').length == 0) return; + var data = $row.data(); if(data.type === 'normal') normal++; if(data.type === 'terminate') terminate++; + total++; }); var summary = ''; if(type != 'all') { - summary = pageSummary.replace('%s', $rows.length); + summary = pageSummary.replace('%s', total); } else { - summary = pageAllSummary.replace('%total%', $rows.length).replace('%normal%', normal).replace('%terminate%', terminate); + summary = pageAllSummary.replace('%total%', total).replace('%normal%', normal).replace('%terminate%', terminate); } $('.table-statistic').html(summary); }); diff --git a/module/projectrelease/view/browse.html.php b/module/projectrelease/view/browse.html.php index 7a9d635c62..befa815247 100644 --- a/module/projectrelease/view/browse.html.php +++ b/module/projectrelease/view/browse.html.php @@ -73,7 +73,7 @@ ?> - >id"), sprintf('%03d', $release->id));?> + >id"), sprintf('%03d', $release->id));?> > marker ? " " : ''; diff --git a/module/release/js/browse.js b/module/release/js/browse.js index 215487f727..3f5f28fce4 100644 --- a/module/release/js/browse.js +++ b/module/release/js/browse.js @@ -3,24 +3,28 @@ $(function() /* Update table summary text. */ var $rows = $('#releaseList').find('tbody>tr'); + var total = 0; var normal = 0; var terminate = 0; $rows.each(function() { var $row = $(this); + if($row.find('td.c-id').length == 0) return; + var data = $row.data(); if(data.type === 'normal') normal++; if(data.type === 'terminate') terminate++; + total++; }); var summary = ''; if(type != 'all') { - summary = pageSummary.replace('%s', $rows.length); + summary = pageSummary.replace('%s', total); } else { - summary = pageAllSummary.replace('%total%', $rows.length).replace('%normal%', normal).replace('%terminate%', terminate); + summary = pageAllSummary.replace('%total%', total).replace('%normal%', normal).replace('%terminate%', terminate); } $('.table-statistic').html(summary); }); diff --git a/module/release/model.php b/module/release/model.php index c866d7574b..eba1139120 100644 --- a/module/release/model.php +++ b/module/release/model.php @@ -54,12 +54,11 @@ class releaseModel extends model */ public function getList($productID, $branch = 'all', $type = 'all', $orderBy = 't1.date_desc', $pager = null) { - $releases = $this->dao->select('t1.*, t2.name as productName') - ->from(TABLE_RELEASE)->alias('t1') + $releases = $this->dao->select('t1.*, t2.name as productName')->from(TABLE_RELEASE)->alias('t1') ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product = t2.id') ->where('t1.deleted')->eq(0) ->beginIF($productID)->andWhere('t1.product')->eq((int)$productID)->fi() - ->beginIF($branch !== 'all')->andWhere('t1.branch')->like(",{$branch},")->fi() + ->beginIF($branch !== 'all')->andWhere("FIND_IN_SET($branch, t1.branch)")->fi() ->beginIF($type != 'all' && $type != 'review')->andWhere('t1.status')->eq($type)->fi() ->beginIF($type == 'review')->andWhere("FIND_IN_SET('{$this->app->user->account}', t1.reviewers)")->fi() ->orderBy($orderBy) diff --git a/module/release/view/browse.html.php b/module/release/view/browse.html.php index 0168a431e5..ad9b6aa7c4 100644 --- a/module/release/view/browse.html.php +++ b/module/release/view/browse.html.php @@ -76,7 +76,7 @@ builds as $build):?> - >id"), sprintf('%03d', $release->id));?> + >id"), sprintf('%03d', $release->id));?> > marker ? " " : '';