Fix purging of non-default locale cached attachments0.18.0.13hotfix/0.18.0.13

2 files changed, 1 insertions, 10 deletions

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 8b606ea85..3bf40b8f9 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -25,8 +25,7 @@ class AdminController < ApplicationController
     def expire_for_request(info_request)
         # Clear out cached entries, by removing files from disk (the built in
         # Rails fragment cache made doing this and other things too hard)
-        cache_subpath = foi_fragment_cache_all_for_request(info_request)
-        FileUtils.rm_rf(cache_subpath)
+        info_request.foi_fragment_cache_directories.each{ |dir| FileUtils.rm_rf(dir) }
 
         # Remove any download zips
         FileUtils.rm_rf(info_request.download_zip_dir)
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 78a82316a..dfe06c3b9 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -189,14 +189,6 @@ class ApplicationController < ActionController::Base
         return File.join(File.split(path).map{|x| x[0...max_file_length]})
     end
 
-    def foi_fragment_cache_all_for_request(info_request)
-        # return stub path so admin can expire it
-        first_three_digits = info_request.id.to_s()[0..2]
-        path = "views/request/#{first_three_digits}/#{info_request.id}"
-        foi_cache_path = File.expand_path(File.join(File.dirname(__FILE__), '../../cache'))
-        return File.join(foi_cache_path, path)
-    end
-
     def foi_fragment_cache_exists?(key_path)
         return File.exists?(key_path)
     end