Merge remote-tracking branch 'upstream/pull/1964'

[rails.git] / app / views / messages / new.html.erb

diff --git a/app/views/messages/new.html.erb b/app/views/messages/new.html.erb
index 73d0ede2aef1e20a22d856a50b7e22703c5191b0..2c008732c1eb389b411c6df0c3e8e7f3b00631d1 100644 (file)
--- a/app/views/messages/new.html.erb
+++ b/app/views/messages/new.html.erb
@@ -4,7 +4,8 @@
 
 <%= error_messages_for 'message' %>
 
-<%= form_for :message, :html => { :class => 'standard-form' }, :url => new_message_path(@message.recipient) do |f| %>
+<%= form_for @message, :html => { :class => 'standard-form' } do |f| %>
+  <%= hidden_field_tag :display_name, @message.recipient.display_name %>
   <fieldset>
     <div class='form-row'>
       <label class="standard-label" for="message_title"><%= t '.subject' %></label>
@@ -16,7 +17,7 @@
     </div>
     <div class='buttons'>
       <%= submit_tag t('.send_button') %>
-      <%= link_to t('.back_to_inbox'), inbox_path(current_user), :class => 'deemphasize button' %>
+      <%= link_to t('.back_to_inbox'), inbox_messages_path, :class => 'deemphasize button' %>
     </div>
   </fieldset>
 <% end %>