diff options
| author | AndrewMurrell <amurrel@purdue.edu> | 2014-04-27 21:08:01 -0400 |
|---|---|---|
| committer | AndrewMurrell <amurrel@purdue.edu> | 2014-04-27 21:08:01 -0400 |
| commit | 35e21c339f87c1b0b1ed2c871c83ae9602adadc0 (patch) | |
| tree | 46f7fa69e3350de1c9b491d16d3b9923fedab454 /app/views/alerts/index.html.erb | |
| parent | dc9c2855c044f18b82a073a6067c81130a99f76a (diff) | |
| parent | 0f6489cdfcc1c75500a66bc906a13b98629e0617 (diff) | |
Merge branch 'master' of http://github.com/LukeShu/leaguer
Diffstat (limited to 'app/views/alerts/index.html.erb')
| -rw-r--r-- | app/views/alerts/index.html.erb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/alerts/index.html.erb b/app/views/alerts/index.html.erb index 1d441a2..c978bea 100644 --- a/app/views/alerts/index.html.erb +++ b/app/views/alerts/index.html.erb @@ -15,7 +15,7 @@ <% if !@alerts.nil? %> <% @alerts.each do |alert| %> <tr> - <td><%= alert.author %></td> + <td><%= alert.author.user_name %></td> <td><%= alert.message %></td> <td><%= link_to 'Show', alert %></td> <td><%= link_to 'Edit', edit_alert_path(alert) %></td> |