summaryrefslogtreecommitdiff
path: root/app/views/groups
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-05-18 08:06:20 -0700
committerGeorge Tsiolis <tsiolis.g@gmail.com>2019-08-05 11:21:41 +0300
commitcaac3104c4e77a40ad8ec3d1275f7b47c0fc8f68 (patch)
tree2c0fec3d934326d1b28401289dfd330e13c6b7b5 /app/views/groups
parent523e00abd74a9067fb17129faa1d35bfa107e04a (diff)
downloadgitlab-ce-caac3104c4e77a40ad8ec3d1275f7b47c0fc8f68.tar.gz
Make it easier to find invited group members
We had a number of team members struggle to find invited members of a group. Searching for the e-mail address did not work because search only works with members with user accounts. This commit changes two things: 1. Breaks out the invited members into a separate table. 2. Adds search capability for the invited members. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/61948
Diffstat (limited to 'app/views/groups')
-rw-r--r--app/views/groups/group_members/index.html.haml23
1 files changed, 22 insertions, 1 deletions
diff --git a/app/views/groups/group_members/index.html.haml b/app/views/groups/group_members/index.html.haml
index 021c0b6c429..ddbf89a5fb7 100644
--- a/app/views/groups/group_members/index.html.haml
+++ b/app/views/groups/group_members/index.html.haml
@@ -36,4 +36,25 @@
= render 'shared/members/sort_dropdown'
%ul.content-list.members-list
= render partial: 'shared/members/member', collection: @members, as: :member
- = paginate @members, theme: 'gitlab'
+ = paginate @members, theme: 'gitlab'
+
+ - if can_manage_members && @invited_members.exists?
+ .clearfix
+ %h5.member.existing-title
+ Invited members
+ .card
+ .card-header.flex-project-members-panel
+ %span.flex-project-title
+ Pending members to
+ %strong= @group.name
+ %span.badge.badge-pill= @invited_members.total_count
+ = 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
+ = search_field_tag :search_invited, params[:search_invited], { placeholder: 'Find invited members by e-mail', class: 'form-control', spellcheck: false }
+ %button.member-search-btn{ type: "submit", "aria-label" => "Submit search" }
+ = icon("search")
+ = render 'shared/members/sort_dropdown'
+ %ul.content-list.invited-members-list
+ = render partial: 'shared/members/member', collection: @invited_members, as: :member
+ = paginate @invited_members, param_name: 'invited_members_page', theme: 'gitlab'