diff options
| author | AndrewMurrell <amurrel@purdue.edu> | 2014-04-27 22:18:45 -0400 |
|---|---|---|
| committer | AndrewMurrell <amurrel@purdue.edu> | 2014-04-27 22:18:45 -0400 |
| commit | 8dcf94aa47869a61a7b03e3117187dee2ffb34f9 (patch) | |
| tree | 4e3dc5af333a38b4bd6c62d78da2087b78fd6b25 | |
| parent | 7620fbd26b7131788eadf5b9a4f7ff4da6a05850 (diff) | |
| parent | 3ef73244d6acaa3a16f4c9c4c276d30cc2753f2a (diff) | |
Merge branch 'master' of http://github.com/LukeShu/leaguer
| -rw-r--r-- | app/controllers/alerts_controller.rb | 1 | ||||
| -rw-r--r-- | app/views/alerts/_form.html.erb | 5 | ||||
| -rw-r--r-- | app/views/alerts/show.html.erb | 2 |
3 files changed, 1 insertions, 7 deletions
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> |