Add 1000+ counters (instead of inifnite) to jobs controller
This commit is contained in:
parent
3fb24bc621
commit
ee2c13d78d
4 changed files with 21 additions and 5 deletions
11
app/helpers/numbers_helper.rb
Normal file
11
app/helpers/numbers_helper.rb
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
module NumbersHelper
|
||||||
|
def limited_counter_with_delimiter(resource, **options)
|
||||||
|
limit = options.fetch(:limit, 1000).to_i
|
||||||
|
count = resource.limit(limit + 1).count(:all)
|
||||||
|
if count > limit
|
||||||
|
number_with_delimiter(count - 1, options) + '+'
|
||||||
|
else
|
||||||
|
number_with_delimiter(count, options)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
|
@ -9,7 +9,7 @@
|
||||||
|
|
||||||
.nav-controls
|
.nav-controls
|
||||||
- if can?(current_user, :update_build, @project)
|
- if can?(current_user, :update_build, @project)
|
||||||
- if @all_builds.running_or_pending.any?
|
- if @all_builds.running_or_pending.limit(1).any?
|
||||||
= link_to 'Cancel running', cancel_all_project_jobs_path(@project),
|
= link_to 'Cancel running', cancel_all_project_jobs_path(@project),
|
||||||
data: { confirm: 'Are you sure?' }, class: 'btn btn-danger', method: :post
|
data: { confirm: 'Are you sure?' }, class: 'btn btn-danger', method: :post
|
||||||
|
|
||||||
|
|
|
@ -3,22 +3,22 @@
|
||||||
= link_to build_path_proc.call(nil) do
|
= link_to build_path_proc.call(nil) do
|
||||||
All
|
All
|
||||||
%span.badge.js-totalbuilds-count
|
%span.badge.js-totalbuilds-count
|
||||||
= number_with_delimiter(all_builds.count(:id))
|
= limited_counter_with_delimiter(all_builds)
|
||||||
|
|
||||||
%li{ class: active_when(scope == 'pending') }>
|
%li{ class: active_when(scope == 'pending') }>
|
||||||
= link_to build_path_proc.call('pending') do
|
= link_to build_path_proc.call('pending') do
|
||||||
Pending
|
Pending
|
||||||
%span.badge
|
%span.badge
|
||||||
= number_with_delimiter(all_builds.pending.count(:id))
|
= limited_counter_with_delimiter(all_builds.pending)
|
||||||
|
|
||||||
%li{ class: active_when(scope == 'running') }>
|
%li{ class: active_when(scope == 'running') }>
|
||||||
= link_to build_path_proc.call('running') do
|
= link_to build_path_proc.call('running') do
|
||||||
Running
|
Running
|
||||||
%span.badge
|
%span.badge
|
||||||
= number_with_delimiter(all_builds.running.count(:id))
|
= limited_counter_with_delimiter(all_builds.running)
|
||||||
|
|
||||||
%li{ class: active_when(scope == 'finished') }>
|
%li{ class: active_when(scope == 'finished') }>
|
||||||
= link_to build_path_proc.call('finished') do
|
= link_to build_path_proc.call('finished') do
|
||||||
Finished
|
Finished
|
||||||
%span.badge
|
%span.badge
|
||||||
= number_with_delimiter(all_builds.finished.count(:id))
|
= limited_counter_with_delimiter(all_builds.finished)
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
title: Add 1000+ counters to job page
|
||||||
|
merge_request:
|
||||||
|
author:
|
||||||
|
type: fixed
|
Loading…
Reference in a new issue