diff options
author | Stan Hu <stanhu@gmail.com> | 2019-05-22 22:34:31 -0700 |
---|---|---|
committer | George Tsiolis <tsiolis.g@gmail.com> | 2019-08-05 11:21:41 +0300 |
commit | e26139a756247b1874ae90f2f9f5a983e5a145ae (patch) | |
tree | 540419b6715346321f29881c1c91ca0f34567d98 /app/views/groups | |
parent | ed29ce3622a82641ecb1e40cf596e1967dd1c19a (diff) | |
download | gitlab-ce-e26139a756247b1874ae90f2f9f5a983e5a145ae.tar.gz |
Show total member count
Diffstat (limited to 'app/views/groups')
-rw-r--r-- | app/views/groups/group_members/index.html.haml | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/app/views/groups/group_members/index.html.haml b/app/views/groups/group_members/index.html.haml index cc4e8b0c31b..74a11bdca41 100644 --- a/app/views/groups/group_members/index.html.haml +++ b/app/views/groups/group_members/index.html.haml @@ -1,6 +1,8 @@ - page_title "Members" - can_manage_members = can?(current_user, :admin_group_member, @group) - show_invited_members = can_manage_members && @invited_members.exists? +- total_members = @members.total_count +- total_members += @invited_members.total_count if show_invited_members .project-members-page.prepend-top-default %h4 @@ -19,10 +21,16 @@ %ul.nav-links.mobile-separator.nav.nav-tabs.clearfix %li.nav-item - = link_to "Existing members", "#existing_members", class: "nav-link active", 'data-toggle' => 'tab' + = link_to "#existing_members", class: "nav-link active", 'data-toggle' => 'tab' do + %span + Existing members + %span.badge.badge-pill= @members.total_count - if show_invited_members %li.nav-item - = link_to "Invited members", "#invited_members", class: "nav-link", 'data-toggle' => 'tab' + = link_to "#invited_members", class: "nav-link", 'data-toggle' => 'tab' do + %span + Pending + %span.badge.badge-pill= @invited_members.total_count .tab-content #existing_members.tab-pane.active @@ -31,7 +39,7 @@ %span.flex-project-title Members with access to %strong= @group.name - %span.badge.badge-pill= @members.total_count + %span.badge.badge-pill= total_members = form_tag group_group_members_path(@group), method: :get, class: 'form-inline member-search-form flex-project-members-form' do .form-group .position-relative.append-right-8 @@ -50,9 +58,9 @@ .card .card-header.flex-project-members-panel %span.flex-project-title - Pending members to + Members with access to %strong= @group.name - %span.badge.badge-pill= @invited_members.total_count + %span.badge.badge-pill= total_members = form_tag group_group_members_path(@group), method: :get, class: 'form-inline member-search-form flex-project-members-form' do .form-group .position-relative.append-right-8 |