diff options
Diffstat (limited to 'app/views/admin_request')
| -rw-r--r-- | app/views/admin_request/_some_requests.rhtml | 6 | ||||
| -rw-r--r-- | app/views/admin_request/show.rhtml | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/app/views/admin_request/_some_requests.rhtml b/app/views/admin_request/_some_requests.rhtml index a5b0bab0e..f2b8e7bea 100644 --- a/app/views/admin_request/_some_requests.rhtml +++ b/app/views/admin_request/_some_requests.rhtml @@ -10,9 +10,9 @@ <% for info_request in info_requests %> <tr class="<%= cycle('odd', 'even') %>"> - <td><%= link_to h(info_request.title), (deep ? '../../request/show/' : 'show/') + info_request.id.to_s %></td> - <td><%= link_to h(info_request.public_body.name), (deep ? '../../body/show/' : '../body/show/') + info_request.public_body.id.to_s %></td> - <td><%= link_to h(info_request.user.name), (deep ? '../../user/show/' : '../user/show/') + info_request.user.id.to_s %></td> + <td><%= request_both_links(info_request) %></td> + <td><%= public_body_both_links(info_request.public_body) %></td> + <td><%= user_both_links(info_request.user) %></td> <% for column in InfoRequest.content_columns.map { |c| c.name } - [ "title", "url_title" ] %> <td><%=h info_request.send(column) %></td> <% end %> diff --git a/app/views/admin_request/show.rhtml b/app/views/admin_request/show.rhtml index bef2e41de..56539be0a 100644 --- a/app/views/admin_request/show.rhtml +++ b/app/views/admin_request/show.rhtml @@ -7,14 +7,14 @@ <strong><%= column.human_name %>:</strong> <%=h @info_request.send(column.name) %> <br/> <% end %> -<strong>Created by:</strong> <%= user_admin_link(@info_request.user) %> <br> -<strong>Public authority:</strong> <%= public_body_admin_link(@info_request.public_body) %> <br> +<strong>Created by:</strong> <%= user_both_links(@info_request.user) %> <br> +<strong>Public authority:</strong> <%= public_body_both_links(@info_request.public_body) %> <br> <strong>Incoming email address:</strong> <%=h @info_request.incoming_email %> <br> </p> <p> -<%= link_to 'Public page', main_url(request_url(@info_request)) %> -| <%= link_to "Edit", '../edit/' + @info_request.id.to_s %> + <%= link_to 'Public page', main_url(request_url(@info_request)) %> + | <%= link_to 'Edit', '../edit/' + @info_request.id.to_s %> </p> <h2>Events</h2> @@ -124,7 +124,7 @@ <% for comment in @info_request.comments.find(:all, :order => 'created_at') %> <tr class="<%= cycle('odd', 'even') %>"> <td><%=h comment.id %></td> - <td><%= user_admin_link(comment.user) %></td> + <td><%= user_both_links(comment.user) %></td> <% for column in Comment.content_columns.map { |c| c.name } %> <td><%=h comment.send(column) %></td> <% end %> |