diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-27 21:30:16 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-27 21:30:16 -0400 |
| commit | ee1eaebb77048d3e3537b5f1f9aead5dc379f849 (patch) | |
| tree | 0b6c73f2641c94dd353f6b28550260f26aaed25d /app/views/alerts/index.html.erb | |
| parent | 83aa6970f730005d8322402ee316e2731fd42506 (diff) | |
| parent | 0f6489cdfcc1c75500a66bc906a13b98629e0617 (diff) | |
Merge branch 'master' of https://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> |