diff options
| author | Katarzyna Kobierska <kkobierska@gmail.com> | 2016-07-05 11:10:34 +0300 |
|---|---|---|
| committer | Katarzyna Kobierska <kkobierska@gmail.com> | 2016-07-18 11:23:32 +0300 |
| commit | 5813aec22dac9a896e75a23781934d555aef4269 (patch) | |
| tree | ae5f48c6ac136facc71fa7c16911e57902776ab6 /app/views | |
| parent | 31a5a03c6ca9e520694755652e57741765c1e9b0 (diff) | |
Add Pending Tab to Admin Builds
Add Pending Tab to Project Builds
Update CHANGELOG
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin/builds/index.html.haml | 7 | ||||
| -rw-r--r-- | app/views/projects/builds/index.html.haml | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/app/views/admin/builds/index.html.haml b/app/views/admin/builds/index.html.haml index 9ea3cca0ecb..0fcff566a70 100644 --- a/app/views/admin/builds/index.html.haml +++ b/app/views/admin/builds/index.html.haml @@ -10,10 +10,15 @@ All %span.badge.js-totalbuilds-count= @all_builds.count(:id) + %li{class: ('active' if @scope == 'pending')} + = link_to admin_builds_path(scope: :pending) do + Pending + %span.badge.js-running-count= number_with_delimiter(@all_builds.pending.count(:id)) + %li{class: ('active' if @scope == 'running')} = link_to admin_builds_path(scope: :running) do Running - %span.badge.js-running-count= number_with_delimiter(@all_builds.running_or_pending.count(:id)) + %span.badge.js-running-count= number_with_delimiter(@all_builds.running.count(:id)) %li{class: ('active' if @scope == 'finished')} = link_to admin_builds_path(scope: :finished) do diff --git a/app/views/projects/builds/index.html.haml b/app/views/projects/builds/index.html.haml index 85c31dfd918..41f0462e4be 100644 --- a/app/views/projects/builds/index.html.haml +++ b/app/views/projects/builds/index.html.haml @@ -11,12 +11,17 @@ %span.badge.js-totalbuilds-count = number_with_delimiter(@all_builds.count(:id)) + %li{class: ('active' if @scope == 'pending')} + = link_to project_builds_path(@project, scope: :pending) do + Pending + %span.badge.js-running-count + = number_with_delimiter(@all_builds.pending.count(:id)) %li{class: ('active' if @scope == 'running')} = link_to project_builds_path(@project, scope: :running) do Running %span.badge.js-running-count - = number_with_delimiter(@all_builds.running_or_pending.count(:id)) + = number_with_delimiter(@all_builds.running.count(:id)) %li{class: ('active' if @scope == 'finished')} = link_to project_builds_path(@project, scope: :finished) do |