Merge remote-tracking branch 'apmon/openstreetbugs2' into openstreetbugs

[rails.git] / app / controllers / message_controller.rb

diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb
index 89a6c143673a0d576663886a47d71372d1b3247c..82e3f30f210d76888430784809b8e463cb8abf51 100644 (file)
--- a/app/controllers/message_controller.rb
+++ b/app/controllers/message_controller.rb
@@ -15,7 +15,7 @@ class MessageController < ApplicationController
     @to_user = User.find_by_display_name(params[:display_name])
     if @to_user
       if params[:message]
     @to_user = User.find_by_display_name(params[:display_name])
     if @to_user
       if params[:message]

-        if @user.sent_messages.count(:conditions => ["sent_on >= ?", Time.now.getutc - 1.hour]) >= APP_CONFIG['max_messages_per_hour']
+        if @user.sent_messages.count(:conditions => ["sent_on >= ?", Time.now.getutc - 1.hour]) >= MAX_MESSAGES_PER_HOUR

           flash[:error] = t 'message.new.limit_exceeded'
         else
           @message = Message.new(params[:message])
           flash[:error] = t 'message.new.limit_exceeded'
         else
           @message = Message.new(params[:message])


@@ -115,6 +115,7 @@ class MessageController < ApplicationController
       if message.save
         if request.xhr?
           render :update do |page|
       if message.save
         if request.xhr?
           render :update do |page|

+            page.replace "inboxanchor", :partial => "layouts/inbox"

             page.replace "inbox-count", :partial => "message_count"
             page.replace "inbox-#{message.id}", :partial => "message_summary", :object => message
           end
             page.replace "inbox-count", :partial => "message_count"
             page.replace "inbox-#{message.id}", :partial => "message_summary", :object => message
           end


@@ -133,7 +134,7 @@ class MessageController < ApplicationController
   def delete
     if params[:message_id]
       id = params[:message_id]
   def delete
     if params[:message_id]
       id = params[:message_id]

-      message = Message.find_by_id(id => ["to_user_id = ? or from_user_id = ?", @user.id, @user.id])
+      message = Message.find_by_id(id, :conditions => ["to_user_id = ? or from_user_id = ?", @user.id, @user.id])

       message.from_user_visible = false if message.sender == @user
       message.to_user_visible = false if message.recipient == @user
       if message.save
       message.from_user_visible = false if message.sender == @user
       message.to_user_visible = false if message.recipient == @user
       if message.save