From 3ef73244d6acaa3a16f4c9c4c276d30cc2753f2a Mon Sep 17 00:00:00 2001
From: guntasgrewal <guntasgrewal@gmail.com>
Date: Sun, 27 Apr 2014 22:17:31 -0400
Subject: Fixed Alerts author field issue.

---
 app/controllers/alerts_controller.rb | 1 -
 app/views/alerts/_form.html.erb      | 5 -----
 app/views/alerts/show.html.erb       | 2 +-
 3 files changed, 1 insertion(+), 7 deletions(-)

(limited to 'app')

diff --git a/app/controllers/alerts_controller.rb b/app/controllers/alerts_controller.rb
index 77ca8b9..b728c7e 100644
--- a/app/controllers/alerts_controller.rb
+++ b/app/controllers/alerts_controller.rb
@@ -27,7 +27,6 @@ class AlertsController < ApplicationController
 		users = {}
 		users = User.all
 
-
 		for i in 0..users.length
 			current_user.send_message(users[i], @alert.message, "Pay Attention!")		
 		end 
diff --git a/app/views/alerts/_form.html.erb b/app/views/alerts/_form.html.erb
index b60eaf2..e7a2444 100644
--- a/app/views/alerts/_form.html.erb
+++ b/app/views/alerts/_form.html.erb
@@ -10,11 +10,6 @@
       </ul>
     </div>
   <% end %>
-
-  <div class="field">
-    <%= f.label :author_id %><br>
-    <%= f.text_field :author_id %>
-  </div>
   <div class="field">
     <%= f.label :message %><br>
     <%= f.text_area :message %>
diff --git a/app/views/alerts/show.html.erb b/app/views/alerts/show.html.erb
index 59d8094..398a10e 100644
--- a/app/views/alerts/show.html.erb
+++ b/app/views/alerts/show.html.erb
@@ -1,6 +1,6 @@
 <p>
   <strong>Author:</strong>
-  <%# @alert.author %>
+  <%= @alert.author.user_name %>
 </p>
 
 <p>
-- 
cgit v1.2.3-54-g00ecf