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

Refactor inbox and outbox paths to avoid display names in urls.

Browse source
This commit is contained in:
Andy Allan 2018-06-06 11:27:27 +08:00
parent 892c30aa8c
commit 9b36021ec5
9 changed files with 33 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/controllers/messages_controller.rb
View file

@ -26,7 +26,7 @@ class MessagesController < ApplicationController
if @message.save
flash[:notice] = t ".message_sent"
Notifier.message_notification(@message).deliver_now
redirect_to :action => "inbox", :display_name => current_user.display_name
redirect_to :action => :inbox
end
end
end
@ -80,19 +80,11 @@ class MessagesController < ApplicationController
# Display the list of messages that have been sent to the user.
def inbox
@title = t ".title"
if current_user && params[:display_name] == current_user.display_name
else
redirect_to :action => "inbox", :display_name => current_user.display_name
end
end
# Display the list of messages that the user has sent to other users.
def outbox
@title = t ".title"
if current_user && params[:display_name] == current_user.display_name
else
redirect_to :action => "outbox", :display_name => current_user.display_name
end
end
# Set the message as being read or unread.
@ -108,7 +100,7 @@ class MessagesController < ApplicationController
@message.message_read = message_read
if @message.save && !request.xhr?
flash[:notice] = notice
redirect_to :action => "inbox", :display_name => current_user.display_name
redirect_to :action => :inbox
end
rescue ActiveRecord::RecordNotFound
@title = t "message.no_such_message.title"
@ -126,7 +118,7 @@ class MessagesController < ApplicationController
if params[:referer]
redirect_to params[:referer]
else
redirect_to :action => "inbox", :display_name => current_user.display_name
redirect_to :action => :inbox
end
end
rescue ActiveRecord::RecordNotFound