summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorLuke Shumaker <shumakl@purdue.edu>2014-04-27 22:25:33 -0400
committerLuke Shumaker <shumakl@purdue.edu>2014-04-27 22:25:33 -0400
commite46b38a457cf9cc685f644be741073df183f53b2 (patch)
treecca6f269a3b392831b2c399146581bbd1325a42d /app/views
parent7722baf950085f57bd037f918b81440219a56846 (diff)
parent3ef73244d6acaa3a16f4c9c4c276d30cc2753f2a (diff)
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'app/views')
-rw-r--r--app/views/alerts/_form.html.erb5
-rw-r--r--app/views/alerts/show.html.erb2
2 files changed, 1 insertions, 6 deletions
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>