cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor @this_user to @user

Browse source 
Historically we used @user for the currently logged in user, but
this was changed to `current_user` in 2017.
This commit is contained in:
Andy Allan 2018-04-11 11:42:33 +08:00
parent fc90b73581
commit 7b2af50f4a
16 changed files with 143 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/message_controller.rb
View file

@ -4,7 +4,7 @@ class MessageController < ApplicationController
before_action :authorize_web
before_action :set_locale
before_action :require_user
before_action :lookup_this_user, :only => [:new]
before_action :lookup_user, :only => [:new]
before_action :check_database_readable
before_action :check_database_writable, :only => [:new, :reply, :mark]
before_action :allow_thirdparty_images, :only => [:new, :read]
@ -19,7 +19,7 @@ class MessageController < ApplicationController
flash[:error] = t "message.new.limit_exceeded"
else
@message = Message.new(message_params)
@message.recipient = @this_user
@message.recipient = @user
@message.sender = current_user
@message.sent_on = Time.now.getutc
@ -31,7 +31,7 @@ class MessageController < ApplicationController
end
end
@message ||= Message.new(message_params.merge(:recipient => @this_user))
@message ||= Message.new(message_params.merge(:recipient => @user))
@title = t "message.new.title"
end