diff options
Diffstat (limited to 'app/views/admin')
| -rw-r--r-- | app/views/admin/index.rhtml | 14 | ||||
| -rw-r--r-- | app/views/admin/timeline.rhtml | 6 |
2 files changed, 9 insertions, 11 deletions
diff --git a/app/views/admin/index.rhtml b/app/views/admin/index.rhtml index 5dd999e44..6749c263f 100644 --- a/app/views/admin/index.rhtml +++ b/app/views/admin/index.rhtml @@ -19,7 +19,7 @@ <ul> <% for message in @holding_pen_messages %> <li> - <%= link_to excerpt(message.get_body_for_quoting, "", 60), "request/show/" + InfoRequest.holding_pen_request.id.to_s + "#incoming-" + message.id.to_s %> + <%= link_to excerpt(message.get_body_for_quoting, "", 60), request_admin_url(InfoRequest.holding_pen_request) + "#incoming-" + message.id.to_s %> (<%=simple_date(message.sent_at)%>) </li> <% end %> @@ -33,8 +33,8 @@ <ul> <% for @request in @ten_days_old_unclassified %> <li> - <%= link_to h(@request.title), "request/show/" + @request.id.to_s %> - (<%=simple_date(@request.get_last_event.created_at)%>) + <%= request_both_links(@request) %> + – <%=simple_date(@request.get_last_event.created_at)%> </li> <% end %> </ul> @@ -46,8 +46,8 @@ <ul> <% for @request in @requires_admin_requests %> <li> - <%= link_to h(@request.title), "request/show/" + @request.id.to_s %> - (<%=simple_date(@request.get_last_event.created_at)%>) + <%= request_both_links(@request)%> + – <%=simple_date(@request.get_last_event.created_at)%> </li> <% end %> </ul> @@ -58,8 +58,8 @@ <ul> <% for @blank_contact in @blank_contacts %> <li> - <%= link_to h(@blank_contact.name), "body/show/" + @blank_contact.id.to_s %> - (<%=simple_date(@blank_contact.updated_at)%>) + <%= public_body_both_links(@blank_contact)%> + – <%=simple_date(@blank_contact.updated_at)%> </li> <% end %> </ul> diff --git a/app/views/admin/timeline.rhtml b/app/views/admin/timeline.rhtml index f24d0be4b..3b77b5821 100644 --- a/app/views/admin/timeline.rhtml +++ b/app/views/admin/timeline.rhtml @@ -23,8 +23,7 @@ <% if event.class.to_s == 'InfoRequestEvent' %> - '<%= link_to h(event.info_request.title), main_url(request_url(event.info_request)) %>' - (<%= link_to "admin", "request/show/" + event.info_request.id.to_s %>) + <%= request_both_links(event.info_request) %> <% if event.event_type == 'edit' %> was edited by administrator <strong><%=h event.params[:editor] %></strong>. <% for p in ['title', 'prominence', 'described_state', 'awaiting_description'] @@ -68,8 +67,7 @@ had '<%=event.event_type%>' done to it, parameters <%=h event.params_yaml%>. <% end %> <% else %> - <%= link_to event.public_body.name, main_url(public_body_url(event.public_body)) %> - (<%= link_to "admin", "body/show/" + event.public_body_id.to_s %>) + <%= public_body_both_links(event.public_body) %> was created/updated by administrator <strong><%=h event.last_edit_editor %></strong> <% end %> <% end %> |