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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
85cecc0b
Commit
85cecc0b
authored
May 16, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix 500 error on group members search
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
cb58e1cb
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
1 deletion
+15
-1
app/controllers/groups_controller.rb
app/controllers/groups_controller.rb
+1
-1
features/group.feature
features/group.feature
+7
-0
features/steps/group/group.rb
features/steps/group/group.rb
+7
-0
No files found.
app/controllers/groups_controller.rb
View file @
85cecc0b
...
@@ -68,7 +68,7 @@ class GroupsController < ApplicationController
...
@@ -68,7 +68,7 @@ class GroupsController < ApplicationController
@members
=
group
.
users_groups
@members
=
group
.
users_groups
if
params
[
:search
].
present?
if
params
[
:search
].
present?
users
=
group
.
users
.
search
(
params
[
:search
])
users
=
group
.
users
.
search
(
params
[
:search
])
.
to_a
@members
=
@members
.
where
(
user_id:
users
)
@members
=
@members
.
where
(
user_id:
users
)
end
end
...
...
features/group.feature
View file @
85cecc0b
...
@@ -113,3 +113,10 @@ Feature: Groups
...
@@ -113,3 +113,10 @@ Feature: Groups
Then
I should see user
"John Doe"
in team list
Then
I should see user
"John Doe"
in team list
Then
I should see user
"Mary Jane"
in team list
Then
I should see user
"Mary Jane"
in team list
Then
I should not see the
"Remove User From Group"
button for
"Mary Jane"
Then
I should not see the
"Remove User From Group"
button for
"Mary Jane"
Scenario
:
Search member by name
Given
"Mary Jane"
is guest of group
"Guest"
And
I visit group
"Guest"
members page
When
I search for 'Mary' member
Then
I should see user
"Mary Jane"
in team list
Then
I should not see user
"John Doe"
in team list
features/steps/group/group.rb
View file @
85cecc0b
...
@@ -157,6 +157,13 @@ class Groups < Spinach::FeatureSteps
...
@@ -157,6 +157,13 @@ class Groups < Spinach::FeatureSteps
# poltergeist always confirms popups.
# poltergeist always confirms popups.
end
end
step
'I search for \'Mary\' member'
do
within
'.member-search-form'
do
fill_in
'search'
,
with:
'Mary'
click_button
'Search'
end
end
protected
protected
def
assigned_to_me
key
def
assigned_to_me
key
...
...
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