diff options
author | Phil Hughes <me@iamphill.com> | 2019-05-21 07:47:11 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2019-05-21 07:47:11 +0000 |
commit | 77ebc2aecf29fb5d1cf65063fe8aa3930e3bf68d (patch) | |
tree | 19a6cfee1c6f9ed4770af75a02bee8158574b764 | |
parent | 65003b01c84a9561d3febab01f6cb0f9a5dd6788 (diff) | |
parent | d95043b63b5266e3e075b9869e01a5d47819c208 (diff) | |
download | gitlab-ce-77ebc2aecf29fb5d1cf65063fe8aa3930e3bf68d.tar.gz |
Merge branch 'new-group-member-scb' into 'master'
Resolve CE/EE diffs in new group member view
Closes gitlab-ee#11026
See merge request gitlab-org/gitlab-ce!28409
-rw-r--r-- | app/helpers/groups/group_members_helper.rb | 7 | ||||
-rw-r--r-- | app/views/groups/group_members/_new_group_member.html.haml | 2 | ||||
-rw-r--r-- | spec/helpers/groups/group_members_helper_spec.rb | 17 |
3 files changed, 25 insertions, 1 deletions
diff --git a/app/helpers/groups/group_members_helper.rb b/app/helpers/groups/group_members_helper.rb new file mode 100644 index 00000000000..a5d2f76820f --- /dev/null +++ b/app/helpers/groups/group_members_helper.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +module Groups::GroupMembersHelper + def group_member_select_options + { multiple: true, class: 'input-clamp', scope: :all, email_user: true } + end +end diff --git a/app/views/groups/group_members/_new_group_member.html.haml b/app/views/groups/group_members/_new_group_member.html.haml index c8cdc2cc3e4..8b511f6866f 100644 --- a/app/views/groups/group_members/_new_group_member.html.haml +++ b/app/views/groups/group_members/_new_group_member.html.haml @@ -1,7 +1,7 @@ = form_for @group_member, url: group_group_members_path(@group), html: { class: 'users-project-form users-group-form' } do |f| .row .col-md-4.col-lg-6 - = users_select_tag(:user_ids, multiple: true, class: 'input-clamp', scope: :all, email_user: true) + = users_select_tag(:user_ids, group_member_select_options) .form-text.text-muted.append-bottom-10 Search for members by name, username, or email, or invite new ones using their email address. diff --git a/spec/helpers/groups/group_members_helper_spec.rb b/spec/helpers/groups/group_members_helper_spec.rb new file mode 100644 index 00000000000..898c330c498 --- /dev/null +++ b/spec/helpers/groups/group_members_helper_spec.rb @@ -0,0 +1,17 @@ +# frozen_string_literal: true + +require "spec_helper" + +describe Groups::GroupMembersHelper do + describe '.group_member_select_options' do + let(:group) { create(:group) } + + before do + helper.instance_variable_set(:@group, group) + end + + it 'returns an options hash' do + expect(helper.group_member_select_options).to include(multiple: true, scope: :all, email_user: true) + end + end +end |