diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-03-11 17:19:55 -0700 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-03-11 17:19:55 -0700 |
| commit | 72357e351d9dbe312f978bc1e2ab0630ed4df03d (patch) | |
| tree | e28775b2fcff8b0d17663e31219aac783cb53ba3 /app/controllers/admin_request_controller.rb | |
| parent | 84e81cbd2b0f98196050d3f5f758ced8a4f841df (diff) | |
| parent | 21ccc19acbe9d8c45c479917e6d53eb1d4a7f35c (diff) | |
Merge remote-tracking branch 'openaustralia_github/make_ui_for_links_in_admin_interface_consistent' into develop
Conflicts:
app/views/admin_censor_rule/new.rhtml
app/views/admin_general/index.rhtml
app/views/admin_general/timeline.rhtml
app/views/admin_request/_some_requests.rhtml
app/views/admin_request/show.rhtml
app/views/admin_track/_some_tracks.rhtml
Diffstat (limited to 'app/controllers/admin_request_controller.rb')
| -rw-r--r-- | app/controllers/admin_request_controller.rb | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/app/controllers/admin_request_controller.rb b/app/controllers/admin_request_controller.rb index d84b44b6f..53055ae32 100644 --- a/app/controllers/admin_request_controller.rb +++ b/app/controllers/admin_request_controller.rb @@ -20,21 +20,6 @@ class AdminRequestController < AdminController :conditions => @query.nil? ? nil : ["lower(title) like lower('%'||?||'%')", @query] end - def list_old_unclassified - @info_requests = WillPaginate::Collection.create((params[:page] or 1), 50) do |pager| - info_requests = InfoRequest.find_old_unclassified(:conditions => ["prominence = 'normal'"], - :limit => pager.per_page, - :offset => pager.offset) - # inject the result array into the paginated collection: - pager.replace(info_requests) - - unless pager.total_entries - # the pager didn't manage to guess the total count, do it manually - pager.total_entries = InfoRequest.count_old_unclassified(:conditions => ["prominence = 'normal'"]) - end - end - end - def show @info_request = InfoRequest.find(params[:id]) # XXX is this *really* the only way to render a template to a |