Merge 14059:14394 from trunk.

[rails.git] / app / views / message / new.rhtml

diff --git a/app/views/message/new.rhtml b/app/views/message/new.rhtml
index d66e7caedb8773d0aa4134cd812d27e8228f8603..17f3588bb47b4b3a6668a0c06111066eea6674b5 100644 (file)
--- a/app/views/message/new.rhtml
+++ b/app/views/message/new.rhtml
@@ -1,7 +1,4 @@
-<% display_name = User.find_by_id(params[:user_id]).display_name %>
-<% title = params[:message] ? params[:message][:title] : params[:title] %>
-
-<h2>Send a new message to <%= h(display_name) %></h2>
+<h2>Send a new message to <%= h(@to_user.display_name) %></h2>

 
 <% if params[:display_name] %>
 <p>Writing a new message to <%= h(params[:display_name]) %></p>  
 
 <% if params[:display_name] %>
 <p>Writing a new message to <%= h(params[:display_name]) %></p>  


@@ -10,15 +7,15 @@
 
 <%= error_messages_for 'message' %>
 
 
 <%= error_messages_for 'message' %>
 

-<% form_for :message do |f| %>
+<% form_for :message, :url => { :action => "new", :user_id => @to_user.id } do |f| %>

   <table>
     <tr valign="top">
       <th>Subject</th>
   <table>
     <tr valign="top">
       <th>Subject</th>

-      <td><%= text_field_tag 'message[title]', title, :size => 60 %></td>
+      <td><%= f.text_field :title, :size => 60, :value => @title %></td>

     </tr>
     <tr valign="top">
       <th>Body</th>
     </tr>
     <tr valign="top">
       <th>Body</th>

-      <td><%= f.text_area :body, :cols => 80 %></td>
+      <td><%= f.text_area :body, :cols => 80, :value => @body %></td>

     </tr>
     <tr>
       <th></th>
     </tr>
     <tr>
       <th></th>