Skip to content

Commit df5f60f

Browse files
committed
Switch to using local variables only
Based on feedback from @olleolleolle, I've updated this controller to only use local variables Signed-off-by: jonathan.kerr <[email protected]>
1 parent a37d2f4 commit df5f60f

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

app/controllers/admin/member_search_controller.rb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@ class Admin::MemberSearchController < Admin::ApplicationController
22
def index
33
member_params = params[:member_search] || {}
44
name = member_params[:name]
5-
@members = name.blank? ? Member.none : Member.find_members(name).select(:id, :name, :surname, :pronouns)
6-
@callback_url = member_params[:callback_url] || params[:callback_url] || results_admin_member_search_index_path
7-
if @members.size == 1
8-
query = { member_pick: { members: [@members.first.id] } }
5+
members = name.blank? ? Member.none : Member.find_members(name).select(:id, :name, :surname, :pronouns)
6+
callback_url = member_params[:callback_url] || params[:callback_url] || results_admin_member_search_index_path
7+
if members.size == 1
8+
query = { member_pick: { members: [members.first.id] } }
99
query_string = query.to_query
10-
callback_url = "#{@callback_url}?#{query_string}"
10+
callback_url = "#{callback_url}?#{query_string}"
1111
redirect_to callback_url and return
1212
end
1313

14-
render 'index', locals: { members: @members, callback_url: @callback_url }
14+
render 'index', locals: { members: members, callback_url: callback_url }
1515
end
1616

1717
def results
18-
@members = Member.find(params[:member_pick][:members])
19-
render 'show', members: @members
18+
members = Member.find(params[:member_pick][:members])
19+
render 'show',locals: { members: members }
2020
end
2121
end

app/views/admin/member_search/show.html.haml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
.col.col-md-10.col-lg-8
88
%h2 Search Results
99
%ul.list-group
10-
- @members.each do |member|
10+
- members.each do |member|
1111
%li.list-group-item
12-
= link_to member.name_and_surname, admin_member_path(member)
12+
= link_to member.name_and_surname, admin_member_path(member)

0 commit comments

Comments
 (0)