X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3c79240a6ab23e4103826dd1cec7a12a19e948db..c57bc002acde3f381ef1c3beaf177b1160255d34:/app/controllers/message_controller.rb diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb index 9b678e274..9dc1d6922 100644 --- a/app/controllers/message_controller.rb +++ b/app/controllers/message_controller.rb @@ -7,34 +7,34 @@ class MessageController < ApplicationController def new @title = 'send message' if params[:message] - to_user = User.find(params[:user_id]) - body = params[:message][:body] - title = params[:message][:title] - message = Message.new - message.body = body - message.title = title - message.to_user_id = params[:user_id] - message.from_user_id = @user.id - message.sent_on = Time.now + @message = Message.new(params[:message]) + @message.to_user_id = params[:user_id] + @message.from_user_id = @user.id + @message.sent_on = Time.now - if message.save + if @message.save flash[:notice] = 'Message sent' + Notifier::deliver_message_notification(@message) redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name - else - @message.errors.add("Sending message failed") end - end end + def reply + message = Message.find(params[:message_id], :conditions => ["to_user_id = ? or from_user_id = ?", @user.id, @user.id ]) + title = message.title.sub(/^Re:\s*/, "Re: ") + redirect_to :action => 'new', :user_id => message.from_user_id, :title => title + rescue ActiveRecord::RecordNotFound + render :nothing => true, :status => :not_found + end + def read @title = 'read message' - if params[:message_id] - id = params[:message_id] - @message = Message.find_by_id(id) - @message.message_read = 1 - @message.save - end + @message = Message.find(params[:message_id], :conditions => ["to_user_id = ? or from_user_id = ?", @user.id, @user.id ]) + @message.message_read = 1 if @message.to_user_id == @user.id + @message.save + rescue ActiveRecord::RecordNotFound + render :nothing => true, :status => :not_found end def inbox @@ -45,6 +45,14 @@ class MessageController < ApplicationController end end + def outbox + @title = 'outbox' + if @user and params[:display_name] == @user.display_name + else + redirect_to :controller => 'message', :action => 'outbox', :display_name => @user.display_name + end + end + def mark if params[:message_id] id = params[:message_id]