Commit 0d09b5fe authored by Kamil Trzcinski's avatar Kamil Trzcinski

Fix builds view count indicator

parent 62bf2eb8
...@@ -8,8 +8,7 @@ class Projects::BuildsController < Projects::ApplicationController ...@@ -8,8 +8,7 @@ class Projects::BuildsController < Projects::ApplicationController
def index def index
@scope = params[:scope] @scope = params[:scope]
@all_builds = project.ci_builds.order('created_at DESC').page(params[:page]).per(30) @all_builds = project.ci_builds
@builds = @builds =
case @scope case @scope
when 'all' when 'all'
...@@ -19,6 +18,7 @@ class Projects::BuildsController < Projects::ApplicationController ...@@ -19,6 +18,7 @@ class Projects::BuildsController < Projects::ApplicationController
else else
@all_builds.running_or_pending @all_builds.running_or_pending
end end
@builds = @builds.order('created_at DESC').page(params[:page]).per(30)
end end
def cancel_all def cancel_all
......
...@@ -12,17 +12,17 @@ ...@@ -12,17 +12,17 @@
%li{class: ('active' if @scope.nil?)} %li{class: ('active' if @scope.nil?)}
= link_to project_builds_path(@project) do = link_to project_builds_path(@project) do
Running Running
%span.badge.js-running-count= @all_builds.running_or_pending.size %span.badge.js-running-count= @all_builds.running_or_pending.count(:id)
%li{class: ('active' if @scope == 'finished')} %li{class: ('active' if @scope == 'finished')}
= link_to project_builds_path(@project, scope: :finished) do = link_to project_builds_path(@project, scope: :finished) do
Finished Finished
%span.badge.js-running-count= @all_builds.finished.size %span.badge.js-running-count= @all_builds.finished.count(:id)
%li{class: ('active' if @scope == 'all')} %li{class: ('active' if @scope == 'all')}
= link_to project_builds_path(@project, scope: :all) do = link_to project_builds_path(@project, scope: :all) do
All All
%span.badge.js-totalbuilds-count= @all_builds.size %span.badge.js-totalbuilds-count= @all_builds.count(:id)
.gray-content-block .gray-content-block
List of #{@scope || 'running'} builds from this project List of #{@scope || 'running'} builds from this project
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment