Merge branch 'fix-group-members-search' into 'master'
Fix group members search Postgres only. 500 error when try to search group members on `/groups/:group_id/members` page
This commit is contained in:
commit
6dfd88a145
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue