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

Handle change from @to_user to @this_user for new message action

Browse source
This commit is contained in:
Tom Hughes 2012-03-22 19:47:24 +00:00
parent 2b037e2892
commit 5270a07bc5
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/message_controller.rb
View file

@ -47,7 +47,7 @@ class MessageController < ApplicationController
if message.to_user_id == @user.id then if message.to_user_id == @user.id then
@body = "On #{message.sent_on} #{message.sender.display_name} wrote:\n\n#{message.body.gsub(/^/, '> ')}" @body = "On #{message.sent_on} #{message.sender.display_name} wrote:\n\n#{message.body.gsub(/^/, '> ')}"
@title = @subject = "Re: #{message.title.sub(/^Re:\s*/, '')}" @title = @subject = "Re: #{message.title.sub(/^Re:\s*/, '')}"
@to_user = User.find(message.from_user_id) @this_user = User.find(message.from_user_id)
render :action => 'new' render :action => 'new'
else else

4
app/views/message/new.html.erb
View file

@ -1,8 +1,8 @@
<h2><%= raw(t'message.new.send_message_to', :name => link_to(h(@to_user.display_name), {:controller => 'user', :action => 'view', :display_name => @to_user.display_name})) %></h2> <h2><%= raw(t'message.new.send_message_to', :name => link_to(h(@this_user.display_name), {:controller => 'user', :action => 'view', :display_name => @this_user.display_name})) %></h2>
<%= error_messages_for 'message' %> <%= error_messages_for 'message' %>
<%= form_for :message, :url => { :action => "new", :display_name => @to_user.display_name } do |f| %> <%= form_for :message, :url => { :action => "new", :display_name => @this_user.display_name } do |f| %>
<table> <table>
<tr valign="top"> <tr valign="top">
<td class="fieldName"><%= t'message.new.subject' %></td> <td class="fieldName"><%= t'message.new.subject' %></td>