summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/controllers/pms_controller.rb4
-rw-r--r--app/views/pms/index.html.erb53
-rw-r--r--app/views/pms/show.html.erb8
3 files changed, 42 insertions, 23 deletions
diff --git a/app/controllers/pms_controller.rb b/app/controllers/pms_controller.rb
index 2cb55f8..1d6540d 100644
--- a/app/controllers/pms_controller.rb
+++ b/app/controllers/pms_controller.rb
@@ -24,8 +24,8 @@ class PmsController < ApplicationController
def create
@pm = Pm.new(pm_params)
@pm.author = current_user
- #require 'pp'
- #pp pm_params['recipient_id']
+ require 'pp'
+ pp @pm.message
@pm.recipient = User.find_by_user_name(pm_params['recipient_id'])
@pm.author.send_message(@pm.recipient, @pm.message, 'Default')
diff --git a/app/views/pms/index.html.erb b/app/views/pms/index.html.erb
index 73c7a87..1175cb2 100644
--- a/app/views/pms/index.html.erb
+++ b/app/views/pms/index.html.erb
@@ -59,14 +59,26 @@
<td><h3>Inbox<h3></td>
</tr>
<tr>
- <% conversation1 = current_user.mailbox.inbox.first %>
- <% if !conversation1.nil? %>
- <% receipts1 = conversation1.receipts_for current_user %>
- <% receipts1.each do |receipt1| %>
- <% message1 = receipt1.message %>
- <td><%= message1.subject %></td>
- <td><%= message1.body %></td>
- <% end %>
+ <% conversations = current_user.mailbox.inbox %>
+ <% if !conversations.nil? %>
+ <tr>
+ <td><b>From</b></td>
+ <td><b>Subject</b></td>
+ <td><b>Body</b></td>
+ </tr>
+ <% conversations.each do |conversation| %>
+ <% receipts = conversation.receipts_for current_user %>
+ <% receipts.each do |receipt| %>
+ <% message = receipt.message %>
+ <tr>
+ <td><%= conversation.last_sender.user_name %></td>
+ <td><%= message.subject %></td>
+ <td><%= message.body %></td>
+ <td><%# link_to 'Show', pm %></td>
+ </tr>
+ <% end %>
+ <% end %>
+
<% else %>
<td><p> No Messages </p></td>
<% end %>
@@ -76,19 +88,26 @@
<td><h3>Outbox<h3></td>
</tr>
<tr>
- <% conversation1 = current_user.mailbox.sentbox.first %>
- <% if !conversation1.nil? %>
+ <% conversations = current_user.mailbox.sentbox %>
+ <% if !conversations.nil? %>
<tr>
- <td><b>From</b></td>
+ <td><b>To</b></td>
<td><b>Subject</b></td>
<td><b>Body</b></td>
</tr>
- <% receipts1 = conversation1.receipts_for current_user %>
- <% receipts1.each do |receipt1| %>
- <% message1 = receipt1.message %>
- <td><%= message1.subject %></td>
- <td><%= message1.body %></td>
- <% end %>
+ <% conversations.each do |conversation| %>
+ <% receipts = conversation.receipts_for current_user %>
+ <% receipts.each do |receipt| %>
+ <% message = receipt.message %>
+ <tr>
+ <td>Doesn't work</td>
+ <td><%= message.subject %></td>
+ <td><%= message.body %></td>
+ <td><%# link_to 'Show', conversation %></td>
+ </tr>
+ <% end %>
+ <% end %>
+
<% else %>
<td><p> No Messages </p></td>
<% end %>
diff --git a/app/views/pms/show.html.erb b/app/views/pms/show.html.erb
index 595afce..cfaf00d 100644
--- a/app/views/pms/show.html.erb
+++ b/app/views/pms/show.html.erb
@@ -1,17 +1,17 @@
<p>
<strong>Author:</strong>
- <%= @pm.author.user_name %>
+ <%= @conversation.last_sender.user_name %>
</p>
<p>
<strong>Recipient:</strong>
- <%= @pm.recipient.user_name %>
+ <%#@pm.recipient.user_name %>
</p>
<p>
<strong>Message:</strong>
- <%= @pm.message %>
+ <%# @pm.message %>
</p>
-<%= link_to 'Edit', edit_pm_path(@pm) %> |
+<%# link_to 'Edit', edit_pm_path(@pm) %> |
<%= link_to 'Back', pms_path %>