aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/admin_controller.rb
diff options
context:
space:
mode:
authorMatthew Landauer <matthew@openaustralia.org>2013-01-04 16:22:24 +1100
committerMatthew Landauer <matthew@openaustralia.org>2013-01-04 16:22:40 +1100
commit58defe7a49eda51676ffaa34ccf2b267d0e62159 (patch)
treef510d276e31f86abecab98d44282e1521c6916a0 /app/controllers/admin_controller.rb
parentc9c599daacc54dcba508fa5868e3aef928b5670d (diff)
parent185c09f98dc670881239ecd230e47fb2f214e53b (diff)
Merge remote-tracking branch 'mysociety/develop' into rails-3-spike
Conflicts: Gemfile.lock Rakefile app/controllers/request_controller.rb lib/tasks/rspec.rake spec/controllers/services_controller_spec.rb spec/spec_helper.rb spec/views/request/_after_actions.rhtml_spec.rb
Diffstat (limited to 'app/controllers/admin_controller.rb')
-rw-r--r--app/controllers/admin_controller.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index d7933b212..d93e68dab 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -28,6 +28,10 @@ class AdminController < ApplicationController
cache_subpath = foi_fragment_cache_all_for_request(info_request)
FileUtils.rm_rf(cache_subpath)
+ # Remove any download zips
+ download_dir = request_download_zip_dir(info_request)
+ FileUtils.rm_rf(download_dir)
+
# Remove the database caches of body / attachment text (the attachment text
# one is after privacy rules are applied)
info_request.clear_in_database_caches!