summaryrefslogtreecommitdiff
path: root/app/views/pms/show.html.erb
diff options
context:
space:
mode:
authornfoy <nfoy@purdue.edu>2014-04-26 23:45:18 -0400
committernfoy <nfoy@purdue.edu>2014-04-26 23:45:18 -0400
commit9d8d6b023ce3390f3ccf9808e630505a15ebebe6 (patch)
tree3e7d2e04b69f10cdcefd61372524da8181f8802d /app/views/pms/show.html.erb
parent2c1e5ab5e7b20dabec9ddb9b34e0cf534afc6d06 (diff)
Messages now check if they're read/unread except when creating a message.
Diffstat (limited to 'app/views/pms/show.html.erb')
-rw-r--r--app/views/pms/show.html.erb8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/views/pms/show.html.erb b/app/views/pms/show.html.erb
index 64dd66e..ca8d9bf 100644
--- a/app/views/pms/show.html.erb
+++ b/app/views/pms/show.html.erb
@@ -4,10 +4,10 @@
<% receps.each do |recep| %>
<% #unless recep == @pm.conversation.last_sender %>
<%= recep.user_name %>
- <%= "and" %>
+ <%= "," %>
<% #end %>
<% end %>
- <%= "the NSA" %>
+ <%= "and the NSA" %>
</p>
<p>
@@ -22,7 +22,7 @@
<p> ________________________________________________ </p>
<p>
- <%= message.sender.user_name %>
+ <b><%= message.sender.user_name %></b>
<%= ":" %>
<%= message.body %>
</p>
@@ -43,5 +43,5 @@
<% end %>
</p>
-
+<% @pm.conversation.mark_as_read(current_user) %>
<%= link_to 'Back', pms_path %>