Merge pull request #177 from sul-dlss/content-dir

The ContentController should operate out of the content directory
sul-dlss · Dec 14, 2018 · 3ac3b82 · 3ac3b82
2 parents 204146e + cdb9064
commit 3ac3b82
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/controllers/content_controller.rb b/app/controllers/content_controller.rb
@@ -5,13 +5,13 @@ class ContentController < ApplicationController
   end
 
   def read
-    location = druid_tools.path(params[:path])
-
+    location = druid_tools.find(:content, params[:path])
+    return render status: :not_found unless location
     send_file location
   end
 
   def list
-    location = druid_tools.path
+    location = druid_tools.content_dir(false)
 
     raise ActionController::MissingFile, location unless Dir.exist? location
 

diff --git a/...or_workspace/ab/123/cd/4567/ab123cd4567/a → ...pace/ab/123/cd/4567/ab123cd4567/content/a b/...or_workspace/ab/123/cd/4567/ab123cd4567/a → ...pace/ab/123/cd/4567/ab123cd4567/content/a