diff options
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/alerts/show.html.erb | 2 | ||||
| -rw-r--r-- | app/views/layouts/application.html.erb | 1 | ||||
| -rw-r--r-- | app/views/pms/_form.html.erb | 4 | ||||
| -rw-r--r-- | app/views/pms/index.html.erb | 4 | ||||
| -rw-r--r-- | app/views/pms/show.html.erb | 4 |
5 files changed, 6 insertions, 9 deletions
diff --git a/app/views/alerts/show.html.erb b/app/views/alerts/show.html.erb index 5dda2c9..59d8094 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 %> </p> <p> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index fb5c1c5..eca33b8 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -30,6 +30,7 @@ <div id="log-buttons"> <% if signed_in? %> <%= link_to current_user.user_name, current_user, :class => "user" %> + <%= link_to "Messages", pms_path %> <%= link_to "Sign out", session_path("current"), method: "delete", :class => "signout" %> <% if current_user.can? :edit_server %> <%= link_to "Server settings", edit_server_path, :class => "server" %> diff --git a/app/views/pms/_form.html.erb b/app/views/pms/_form.html.erb index 480e308..e9a7c08 100644 --- a/app/views/pms/_form.html.erb +++ b/app/views/pms/_form.html.erb @@ -12,10 +12,6 @@ <% end %> <div class="field"> - <%= f.label :author_id %><br> - <%= f.text_field :author_id %> - </div> - <div class="field"> <%= f.label :recipient_id %><br> <%= f.text_field :recipient_id %> </div> diff --git a/app/views/pms/index.html.erb b/app/views/pms/index.html.erb index cb7fe4b..f5dfe02 100644 --- a/app/views/pms/index.html.erb +++ b/app/views/pms/index.html.erb @@ -15,8 +15,8 @@ <tbody> <% @pms.each do |pm| %> <tr> - <td><%= pm.author %></td> - <td><%= pm.recipient %></td> + <td><%= pm.author.user_name %></td> + <td><%= pm.recipient.user_name %></td> <td><%= pm.message %></td> <td><%= link_to 'Show', pm %></td> <td><%= link_to 'Edit', edit_pm_path(pm) %></td> diff --git a/app/views/pms/show.html.erb b/app/views/pms/show.html.erb index 2a03716..595afce 100644 --- a/app/views/pms/show.html.erb +++ b/app/views/pms/show.html.erb @@ -1,11 +1,11 @@ <p> <strong>Author:</strong> - <%= @pm.author %> + <%= @pm.author.user_name %> </p> <p> <strong>Recipient:</strong> - <%= @pm.recipient %> + <%= @pm.recipient.user_name %> </p> <p> |