Skip to content

Commit 91bbf94

Browse files
committed
Refactor user handling in NamesController
1 parent 785c0c3 commit 91bbf94

2 files changed

Lines changed: 6 additions & 5 deletions

File tree

app/controllers/names_controller.rb

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ def autocomplete
5454
# GET /names.json
5555
def index(opts = {})
5656
return user if params[:user].present? && opts == {}
57+
@user ||= nil
5758
@submitted ||= false
5859
@endorsed ||= false
5960
@draft ||= false
@@ -117,13 +118,13 @@ def type_genomes
117118
# GET /names/user
118119
# GET /names/user?user=abc
119120
def user
120-
user = current_user
121+
@user = current_user
121122
if params[:user] && current_user&.admin?
122-
user = User.find_by(username: params[:user])
123+
@user = User.find_by(username: params[:user])
123124
end
124-
@title = "Names by #{user&.username}"
125+
@title = "Names by #{@user&.username}"
125126
@status = 'all'
126-
index(where: { created_by: user })
127+
index(where: { created_by: @user })
127128
render(:index)
128129
end
129130

app/views/names/index.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<span class="text-muted"></span>
4040
<%=
4141
status == @status ?
42-
status : link_to(status, names_path(npar.merge(status: status))
42+
status : link_to(status, names_path(npar.merge(status: status)))
4343
%>
4444
<% end %>
4545
</div>

0 commit comments

Comments
 (0)