patched controller section of #648

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

diff --git a/app/views/message/read.rhtml b/app/views/message/read.rhtml
index 7a0d2bbe12438a5e0fc1c6fd355a6958aae70c79..7c010b9d5e90ebbfb23ed0c69fc9fb9a2b5ed1dc 100644 (file)
--- a/app/views/message/read.rhtml
+++ b/app/views/message/read.rhtml
@@ -1,3 +1,5 @@
+<% if @user == @message.recipient %>
+

 <h2>Reading your messages</h2>
 
 <table>
 <h2>Reading your messages</h2>
 
 <table>


@@ -7,7 +9,7 @@
   </tr>
   <tr>
     <th align="right">Subject</th>
   </tr>
   <tr>
     <th align="right">Subject</th>

-    <td><%= @message.title %></td>
+    <td><%= h(@message.title) %></td>

   </tr>
   <tr>
     <th align="right">Date</th>
   </tr>
   <tr>
     <th align="right">Date</th>


@@ -15,7 +17,7 @@
   </tr>
   <tr>
     <th></th>
   </tr>
   <tr>
     <th></th>

-    <td><%= @message.body %></td>
+    <td><%= htmlize(@message.body) %></td>

   </tr>
 </table>
 
   </tr>
 </table>
 


@@ -23,8 +25,41 @@
 
 <table>
   <tr>
 
 <table>
   <tr>

-    <td><%= button_to 'Reply', :controller => 'message', :action => 'new', :user_id => @message.from_user_id %></td>
+    <td><%= button_to 'Reply', :controller => 'message', :action => 'reply', :message_id => @message.id %></td>

     <td><%= button_to 'Mark as unread', :controller => 'message', :action => 'mark', :message_id => @message.id, :mark => 'unread' %></td>
     <td><%= link_to 'Back to inbox', :controller => 'message', :action => 'inbox', :display_name => @user.display_name %></td>
   </tr>
 </table>
     <td><%= button_to 'Mark as unread', :controller => 'message', :action => 'mark', :message_id => @message.id, :mark => 'unread' %></td>
     <td><%= link_to 'Back to inbox', :controller => 'message', :action => 'inbox', :display_name => @user.display_name %></td>
   </tr>
 </table>

+
+<% else %>
+
+<h2>Reading your sent messages</h2>
+
+<table>
+  <tr>
+    <th align="right">To</th>
+    <td><%= link_to @message.recipient.display_name, :controller => 'user', :action => 'view', :display_name => @message.recipient.display_name %></td>
+  </tr>
+  <tr>
+    <th align="right">Subject</th>
+    <td><%= h(@message.title) %></td>
+  </tr>
+  <tr>
+    <th align="right">Date</th>
+    <td><%= @message.sent_on %></td>
+  </tr>
+  <tr>
+    <th></th>
+    <td><%= htmlize(@message.body) %></td>
+  </tr>
+</table>
+
+<br />
+
+<table>
+  <tr>
+    <td><%= link_to 'Back to outbox', :controller => 'message', :action => 'outbox', :display_name => @user.display_name %></td>
+  </tr>
+</table>
+
+<% end %>