Merge branch '14345-proppatch'

[arvados.git] / services / api / app / controllers / arvados / v1 / collections_controller.rb

diff --git a/services/api/app/controllers/arvados/v1/collections_controller.rb b/services/api/app/controllers/arvados/v1/collections_controller.rb
index 1d4ade6dd0ea30d17542687e8533d2c505b3883c..5d7a7ae266b82fa918a47312c6584d0897a6231c 100644 (file)
--- a/services/api/app/controllers/arvados/v1/collections_controller.rb
+++ b/services/api/app/controllers/arvados/v1/collections_controller.rb
@@ -36,7 +36,7 @@ class Arvados::V1::CollectionsController < ApplicationController
     if params[:include_trash] || ['destroy', 'trash', 'untrash'].include?(action_name)
       opts.update({include_trash: true})
     end
-    if params[:include_old_versions]
+    if params[:include_old_versions] || @include_old_versions
       opts.update({include_old_versions: true})
     end
     @objects = Collection.readable_by(*@read_users, opts) if !opts.empty?
@@ -44,6 +44,8 @@ class Arvados::V1::CollectionsController < ApplicationController
   end
 
   def find_object_by_uuid
+    @include_old_versions = true
+
     if loc = Keep::Locator.parse(params[:id])
       loc.strip_hints!
 
@@ -233,17 +235,4 @@ class Arvados::V1::CollectionsController < ApplicationController
       @select ||= model_class.selectable_attributes - ["manifest_text", "unsigned_manifest_text"]
     end
   end
-
-  def load_filters_param
-    super
-    return if !params[:include_old_versions]
-    @filters = @filters.map do |col, operator, operand|
-      # Replace uuid filters when including past versions
-      if col == 'uuid'
-        ['current_version_uuid', operator, operand]
-      else
-        [col, operator, operand]
-      end
-    end
-  end
 end