Skip to content

Commit

Permalink
Merge pull request #6487 from dmarcoux/consistent-badges
Browse files Browse the repository at this point in the history
Be consistent in displaying counts
  • Loading branch information
Dany Marcoux committed Dec 6, 2018
2 parents 8ea707f + 637ab27 commit b7b5ea0
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions src/api/app/views/webui2/webui/project/show.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,16 @@
%li.nav-item
%a.nav-link.active#packages-tab{ href: '#packages', role: 'tab', data: { toggle: 'tab' },
aria: { controls: 'packages', selected: 'true' } }
Packages (#{@packages.length})
Packages
%span.badge.badge-primary
= @packages.length
- if @ipackages.present?
%li.nav-item
%a.nav-link#inherited-packages-tab{ href: '#inherited-packages', role: 'tab', data: { toggle: 'tab' },
aria: { controls: 'inherited-packages', selected: 'false' } }
Inherited Packages (#{@ipackages.length})
Inherited Packages
%span.badge.badge-primary
= @ipackages.length
.tab-content#packages-tabs-content
.tab-pane.fade.show.active#packages{ role: 'tabpanel', aria: { labelledby: 'packages-tab' } }
= render partial: 'project_packages', locals: { project: @project, packages: @packages, remote_projects: @remote_projects }
Expand Down

0 comments on commit b7b5ea0

Please sign in to comment.