X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/226c41be692452129227f30d67f2d847e510015c..85d17f257c338f668a1d17d9fc62a2f48ec84230:/app/controllers/message_controller.rb?ds=inline diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb index 6e0c717b5..ec183fc3e 100644 --- a/app/controllers/message_controller.rb +++ b/app/controllers/message_controller.rb @@ -103,7 +103,7 @@ class MessageController < ApplicationController def mark if params[:message_id] id = params[:message_id] - message = Message.where(:id => id).where("to_user_id = ? OR from_user_id = ?", @user.id, @user.id).first + @message = Message.where(:id => id).where("to_user_id = ? OR from_user_id = ?", @user.id, @user.id).first if params[:mark] == 'unread' message_read = false notice = t 'message.mark.as_unread' @@ -111,15 +111,9 @@ class MessageController < ApplicationController message_read = true notice = t 'message.mark.as_read' end - message.message_read = message_read - 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 - else + @message.message_read = message_read + if @message.save + if not request.xhr? flash[:notice] = notice redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name end