kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'use-count-badges' into 'master'

Browse source 
Use count badges with number_with_delimiter helper for issue, commit count

See merge request !658
This commit is contained in:
Dmitriy Zaporozhets 2015-05-15 09:56:56 +00:00
commit 3b4c0ea06f
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/helpers/application_helper.rb
View file

@ -324,12 +324,20 @@ module ApplicationHelper
count = count =
if project.nil? if project.nil?
"" nil
elsif current_controller?(:issues) elsif current_controller?(:issues)
" (#{project.issues.send(entity).count})" project.issues.send(entity).count
elsif current_controller?(:merge_requests) elsif current_controller?(:merge_requests)
" (#{project.merge_requests.send(entity).count})" project.merge_requests.send(entity).count
end end
"#{entity_title}#{count}"
html = content_tag :span, entity_title
if count.present?
html += " "
html += content_tag :span, number_with_delimiter(count), class: 'badge'
end
html.html_safe
end end
end end

2
app/views/projects/commits/_head.html.haml
View file

@ -3,7 +3,7 @@
= link_to namespace_project_commits_path(@project.namespace, @project, @ref || @repository.root_ref) do = link_to namespace_project_commits_path(@project.namespace, @project, @ref || @repository.root_ref) do
= icon("history") = icon("history")
Commits Commits
%span.badge= number_with_precision(@repository.commit_count, precision: 0, delimiter: ',') %span.badge= number_with_delimiter(@repository.commit_count)
= nav_link(controller: :compare) do = nav_link(controller: :compare) do
= link_to namespace_project_compare_index_path(@project.namespace, @project, from: @repository.root_ref, to: @ref || @repository.root_ref) do = link_to namespace_project_compare_index_path(@project.namespace, @project, from: @repository.root_ref, to: @ref || @repository.root_ref) do
= icon("exchange") = icon("exchange")