-class MessageController < ApplicationController
+class MessagesController < ApplicationController
layout "site"
before_action :authorize_web
def new
if request.post?
if current_user.sent_messages.where("sent_on >= ?", Time.now.getutc - 1.hour).count >= MAX_MESSAGES_PER_HOUR
- flash[:error] = t "message.new.limit_exceeded"
+ flash[:error] = t ".limit_exceeded"
else
@message = Message.new(message_params)
@message.recipient = @user
@message.sent_on = Time.now.getutc
if @message.save
- flash[:notice] = t "message.new.message_sent"
+ flash[:notice] = t ".message_sent"
Notifier.message_notification(@message).deliver_now
redirect_to :action => "inbox", :display_name => current_user.display_name
end
end
@message ||= Message.new(message_params.merge(:recipient => @user))
- @title = t "message.new.title"
+ @title = t ".title"
end
# Allow the user to reply to another message.
render :action => "new"
else
- flash[:notice] = t "message.reply.wrong_user", :user => current_user.display_name
+ flash[:notice] = t ".wrong_user", :user => current_user.display_name
redirect_to :controller => "user", :action => "login", :referer => request.fullpath
end
rescue ActiveRecord::RecordNotFound
# Show a message
def read
- @title = t "message.read.title"
+ @title = t ".title"
@message = Message.find(params[:message_id])
if @message.recipient == current_user || @message.sender == current_user
@message.message_read = true if @message.recipient == current_user
@message.save
else
- flash[:notice] = t "message.read.wrong_user", :user => current_user.display_name
+ flash[:notice] = t ".wrong_user", :user => current_user.display_name
redirect_to :controller => "user", :action => "login", :referer => request.fullpath
end
rescue ActiveRecord::RecordNotFound
# Display the list of messages that have been sent to the user.
def inbox
- @title = t "message.inbox.title"
+ @title = t ".title"
if current_user && params[:display_name] == current_user.display_name
else
redirect_to :action => "inbox", :display_name => current_user.display_name
# Display the list of messages that the user has sent to other users.
def outbox
- @title = t "message.outbox.title"
+ @title = t ".title"
if current_user && params[:display_name] == current_user.display_name
else
redirect_to :action => "outbox", :display_name => current_user.display_name
@message = Message.where("to_user_id = ? OR from_user_id = ?", current_user.id, current_user.id).find(params[:message_id])
if params[:mark] == "unread"
message_read = false
- notice = t "message.mark.as_unread"
+ notice = t ".as_unread"
else
message_read = true
- notice = t "message.mark.as_read"
+ notice = t ".as_read"
end
@message.message_read = message_read
if @message.save && !request.xhr?
@message.from_user_visible = false if @message.sender == current_user
@message.to_user_visible = false if @message.recipient == current_user
if @message.save && !request.xhr?
- flash[:notice] = t "message.delete.deleted"
+ flash[:notice] = t ".deleted"
if params[:referer]
redirect_to params[:referer]
<p id="inbox-count">
-<%= t "message.inbox.messages",
- :new_messages => t("message.inbox.new_messages",
+<%= t "messages.inbox.messages",
+ :new_messages => t("messages.inbox.new_messages",
:count => current_user.new_messages.size),
- :old_messages => t("message.inbox.old_messages",
+ :old_messages => t("messages.inbox.old_messages",
:count => current_user.messages.size - current_user.new_messages.size)
%>
</p>
partial_changeset_without_comment: "without comment"
details: "More details about the changeset can be found at %{url}."
unsubscribe: 'To unsubscribe from updates to this changeset, visit %{url} and click "Unsubscribe".'
- message:
+ messages:
inbox:
title: "Inbox"
my_inbox: "My Inbox"
get "/export/embed" => "export#embed"
# messages
- get "/user/:display_name/inbox" => "message#inbox", :as => "inbox"
- get "/user/:display_name/outbox" => "message#outbox", :as => "outbox"
- match "/message/new/:display_name" => "message#new", :via => [:get, :post], :as => "new_message"
- get "/message/read/:message_id" => "message#read", :as => "read_message"
- post "/message/mark/:message_id" => "message#mark", :as => "mark_message"
- match "/message/reply/:message_id" => "message#reply", :via => [:get, :post], :as => "reply_message"
- post "/message/delete/:message_id" => "message#delete", :as => "delete_message"
+ get "/user/:display_name/inbox" => "messages#inbox", :as => "inbox"
+ get "/user/:display_name/outbox" => "messages#outbox", :as => "outbox"
+ match "/message/new/:display_name" => "messages#new", :via => [:get, :post], :as => "new_message"
+ get "/message/read/:message_id" => "messages#read", :as => "read_message"
+ post "/message/mark/:message_id" => "messages#mark", :as => "mark_message"
+ match "/message/reply/:message_id" => "messages#reply", :via => [:get, :post], :as => "reply_message"
+ post "/message/delete/:message_id" => "messages#delete", :as => "delete_message"
# oauth admin pages (i.e: for setting up new clients, etc...)
scope "/user/:display_name" do
require "test_helper"
-class MessageControllerTest < ActionController::TestCase
+class MessagesControllerTest < ActionController::TestCase
##
# test all routes which lead to this controller
def test_routes
assert_routing(
{ :path => "/user/username/inbox", :method => :get },
- { :controller => "message", :action => "inbox", :display_name => "username" }
+ { :controller => "messages", :action => "inbox", :display_name => "username" }
)
assert_routing(
{ :path => "/user/username/outbox", :method => :get },
- { :controller => "message", :action => "outbox", :display_name => "username" }
+ { :controller => "messages", :action => "outbox", :display_name => "username" }
)
assert_routing(
{ :path => "/message/new/username", :method => :get },
- { :controller => "message", :action => "new", :display_name => "username" }
+ { :controller => "messages", :action => "new", :display_name => "username" }
)
assert_routing(
{ :path => "/message/new/username", :method => :post },
- { :controller => "message", :action => "new", :display_name => "username" }
+ { :controller => "messages", :action => "new", :display_name => "username" }
)
assert_routing(
{ :path => "/message/read/1", :method => :get },
- { :controller => "message", :action => "read", :message_id => "1" }
+ { :controller => "messages", :action => "read", :message_id => "1" }
)
assert_routing(
{ :path => "/message/mark/1", :method => :post },
- { :controller => "message", :action => "mark", :message_id => "1" }
+ { :controller => "messages", :action => "mark", :message_id => "1" }
)
assert_routing(
{ :path => "/message/reply/1", :method => :get },
- { :controller => "message", :action => "reply", :message_id => "1" }
+ { :controller => "messages", :action => "reply", :message_id => "1" }
)
assert_routing(
{ :path => "/message/reply/1", :method => :post },
- { :controller => "message", :action => "reply", :message_id => "1" }
+ { :controller => "messages", :action => "reply", :message_id => "1" }
)
assert_routing(
{ :path => "/message/delete/1", :method => :post },
- { :controller => "message", :action => "delete", :message_id => "1" }
+ { :controller => "messages", :action => "delete", :message_id => "1" }
)
end