Merge 468fe28 into 204146e

sul-dlss · Dec 14, 2018 · 32d7aae · 32d7aae
2 parents 204146e + 468fe28
commit 32d7aae
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 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])
 
     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