Merge branch 'master' of https://github.com/LukeShu/leaguer

6 files changed, 59 insertions, 33 deletions

diff --git a/app/controllers/alerts_controller.rb b/app/controllers/alerts_controller.rb
index 333022a..6ab3663 100644
--- a/app/controllers/alerts_controller.rb
+++ b/app/controllers/alerts_controller.rb
@@ -23,7 +23,7 @@ class AlertsController < ApplicationController
 	# POST /alerts.json
 	def create
 		@alert = Alert.new(alert_params)
-
+		@alert.author = current_user
 		respond_to do |format|
 			if @alert.save
 				format.html { redirect_to @alert, notice: 'Alert was successfully created.' }
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/alerts/index.html.erb b/app/views/alerts/index.html.erb
index 458b951..1d441a2 100644
--- a/app/views/alerts/index.html.erb
+++ b/app/views/alerts/index.html.erb
@@ -12,14 +12,18 @@
   </thead>
 
   <tbody>
-    <% @alerts.each do |alert| %>
-      <tr>
-        <td><%= alert.author %></td>
-        <td><%= alert.message %></td>
-        <td><%= link_to 'Show', alert %></td>
-        <td><%= link_to 'Edit', edit_alert_path(alert) %></td>
-        <td><%= link_to 'Destroy', alert, method: :delete, data: { confirm: 'Are you sure?' } %></td>
-      </tr>
+    <% if !@alerts.nil? %>
+      <% @alerts.each do |alert| %>
+        <tr>
+          <td><%= alert.author %></td>
+          <td><%= alert.message %></td>
+          <td><%= link_to 'Show', alert %></td>
+          <td><%= link_to 'Edit', edit_alert_path(alert) %></td>
+          <td><%= link_to 'Destroy', alert, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+        </tr>
+      <% end %> 
+    <% else %>
+      <td><p>There are no alerts!</p></td>
     <% end %>
   </tbody>
 </table>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 6cdb54d..dd0ea91 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -27,11 +27,14 @@
 	<div id="log-buttons">
 		<% if signed_in? %>
 			<%= link_to current_user.user_name, current_user, :class => "user" %>
-			<%= link_to "Messages", pms_path %>
+			<%= link_to "Messages", pms_path, :class => "signup" %>
 			<%= link_to "Sign out", session_path("current"), method: "delete", :class => "signout" %>
 			<% if current_user.can? :edit_server %>
 				<%= link_to "Server settings", edit_server_path, :class => "server" %>
 			<% end %>
+			<% if current_user.can? :create_alert %>
+				<%= link_to "Create Alert", new_alert_path, :class => "signin" %>
+			<% end %>
 		<% else %>
 			<%= link_to "Log in", new_session_path, :class => "signin" %>
 			<%= link_to "Sign up", new_user_path, :class => "signup" %>
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 %>