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
d39871d0
Commit
d39871d0
authored
Aug 09, 2019
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename search_invited to search_invite_email
parent
60a1e843
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
4 deletions
+6
-4
app/controllers/groups/group_members_controller.rb
app/controllers/groups/group_members_controller.rb
+1
-1
app/models/member.rb
app/models/member.rb
+1
-1
spec/models/member_spec.rb
spec/models/member_spec.rb
+4
-2
No files found.
app/controllers/groups/group_members_controller.rb
View file @
d39871d0
...
...
@@ -29,7 +29,7 @@ class Groups::GroupMembersController < Groups::ApplicationController
if
can_manage_members
@invited_members
=
@members
.
invite
@invited_members
=
@invited_members
.
search_invite
d
(
params
[
:search_invited
])
if
params
[
:search_invited
].
present?
@invited_members
=
@invited_members
.
search_invite
_email
(
params
[
:search_invited
])
if
params
[
:search_invited
].
present?
@invited_members
=
present_members
(
@invited_members
.
page
(
params
[
:invited_members_page
]).
per
(
MEMBER_PER_PAGE_LIMIT
))
end
...
...
app/models/member.rb
View file @
d39871d0
...
...
@@ -107,7 +107,7 @@ class Member < ApplicationRecord
joins
(
:user
).
merge
(
User
.
search
(
query
))
end
def
search_invite
d
(
query
)
def
search_invite
_email
(
query
)
invite
.
where
([
'invite_email ILIKE ?'
,
"%
#{
query
}
%"
])
end
...
...
spec/models/member_spec.rb
View file @
d39871d0
...
...
@@ -172,14 +172,16 @@ describe Member do
it
{
expect
(
described_class
.
non_request
).
to
include
@accepted_request_member
}
end
describe
'.search_invite
d
'
do
describe
'.search_invite
_email
'
do
it
'returns only the matching e-mail'
do
create
(
:group_member
,
:invited
)
invited
=
described_class
.
search_invite
d
(
@invited_member
.
invite_email
)
invited
=
described_class
.
search_invite
_email
(
@invited_member
.
invite_email
)
expect
(
invited
.
count
).
to
eq
(
1
)
expect
(
invited
.
first
).
to
eq
(
@invited_member
)
expect
(
described_class
.
search_invite_email
(
'bad-email@example.com'
).
count
).
to
eq
(
0
)
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