Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
d95043b6
Commit
d95043b6
authored
May 17, 2019
by
Luke Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve CE/EE diffs in new group member view
Part of single codebase changes.
parent
2d8ba2db
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
1 deletion
+25
-1
app/helpers/groups/group_members_helper.rb
app/helpers/groups/group_members_helper.rb
+7
-0
app/views/groups/group_members/_new_group_member.html.haml
app/views/groups/group_members/_new_group_member.html.haml
+1
-1
spec/helpers/groups/group_members_helper_spec.rb
spec/helpers/groups/group_members_helper_spec.rb
+17
-0
No files found.
app/helpers/groups/group_members_helper.rb
0 → 100644
View file @
d95043b6
# frozen_string_literal: true
module
Groups::GroupMembersHelper
def
group_member_select_options
{
multiple:
true
,
class:
'input-clamp'
,
scope: :all
,
email_user:
true
}
end
end
app/views/groups/group_members/_new_group_member.html.haml
View file @
d95043b6
=
form_for
@group_member
,
url:
group_group_members_path
(
@group
),
html:
{
class:
'users-project-form users-group-form'
}
do
|
f
|
=
form_for
@group_member
,
url:
group_group_members_path
(
@group
),
html:
{
class:
'users-project-form users-group-form'
}
do
|
f
|
.row
.row
.col-md-4.col-lg-6
.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
.form-text.text-muted.append-bottom-10
Search for members by name, username, or email, or invite new ones using their email address.
Search for members by name, username, or email, or invite new ones using their email address.
...
...
spec/helpers/groups/group_members_helper_spec.rb
0 → 100644
View file @
d95043b6
# 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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment