diff options
| -rw-r--r-- | app/views/admin_public_body/show.rhtml | 3 | ||||
| -rw-r--r-- | app/views/admin_request/_some_requests.rhtml | 18 | ||||
| -rw-r--r-- | app/views/admin_request/list.rhtml | 17 | ||||
| -rw-r--r-- | app/views/admin_user/show.rhtml | 4 |
4 files changed, 25 insertions, 17 deletions
diff --git a/app/views/admin_public_body/show.rhtml b/app/views/admin_public_body/show.rhtml index 9791a9155..a97b01a1c 100644 --- a/app/views/admin_public_body/show.rhtml +++ b/app/views/admin_public_body/show.rhtml @@ -40,3 +40,6 @@ <% end %> </table> +<h2>Requests</h2> +<%= render :partial => 'admin_request/some_requests', :locals => { :info_requests => @public_body.info_requests, :deep => true } %> + diff --git a/app/views/admin_request/_some_requests.rhtml b/app/views/admin_request/_some_requests.rhtml new file mode 100644 index 000000000..3c8f5c489 --- /dev/null +++ b/app/views/admin_request/_some_requests.rhtml @@ -0,0 +1,18 @@ +<table> + <tr> + <% for column in InfoRequest.content_columns.map { |c| c.human_name } - [ "Url title" ] %> + <th><%= column %></th> + <% end %> + </tr> + +<% 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> + <% for column in InfoRequest.content_columns.map { |c| c.name } - [ "title", "url_title" ] %> + <td><%=h info_request.send(column) %></td> + <% end %> + </tr> +<% end %> +</table> + + diff --git a/app/views/admin_request/list.rhtml b/app/views/admin_request/list.rhtml index ce2d53b39..f95a9a86b 100644 --- a/app/views/admin_request/list.rhtml +++ b/app/views/admin_request/list.rhtml @@ -9,22 +9,7 @@ </p> <% end %> -<table> - <tr> - <% for column in InfoRequest.content_columns.map { |c| c.human_name } - [ "Url title" ] %> - <th><%= column %></th> - <% end %> - </tr> - -<% for info_request in @info_requests %> - <tr class="<%= cycle('odd', 'even') %>"> - <td><%= link_to h(info_request.title), 'show/' + info_request.id.to_s %></td> - <% for column in InfoRequest.content_columns.map { |c| c.name } - [ "title", "url_title" ] %> - <td><%=h info_request.send(column) %></td> - <% end %> - </tr> -<% end %> -</table> +<%= render :partial => 'some_requests', :locals => { :info_requests => @info_requests, :deep => false } %> <%= will_paginate(@info_requests) %> diff --git a/app/views/admin_user/show.rhtml b/app/views/admin_user/show.rhtml index 960e3f1a2..68d72feea 100644 --- a/app/views/admin_user/show.rhtml +++ b/app/views/admin_user/show.rhtml @@ -39,7 +39,6 @@ <% end %> </table> - <h2>Post redirects</h2> <table> @@ -64,4 +63,7 @@ <% end %> </table> +<h2>Requests</h2> +<%= render :partial => 'admin_request/some_requests', :locals => { :info_requests => @admin_user.info_requests, :deep => true } %> + |