From 764da69855e222afd3ba888c34e6fe10f3578aca Mon Sep 17 00:00:00 2001
From: Tom Clegg <tom@tomclegg.ca>
Date: Wed, 7 Oct 2020 13:30:47 -0400
Subject: [PATCH] 16928: Fix advertised default value of include_old_versions.

Also remove special defaults-override logic, now that the existing
load_params code knows the right defaults.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@tomclegg.ca>
---
 .../arvados/v1/collections_controller.rb      | 26 +++++++------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/services/api/app/controllers/arvados/v1/collections_controller.rb b/services/api/app/controllers/arvados/v1/collections_controller.rb
index 656bd37ae6..b174879d09 100644
--- a/services/api/app/controllers/arvados/v1/collections_controller.rb
+++ b/services/api/app/controllers/arvados/v1/collections_controller.rb
@@ -28,7 +28,7 @@ class Arvados::V1::CollectionsController < ApplicationController
           type: 'boolean', required: false, description: "Show collection even if its is_trashed attribute is true."
         },
         include_old_versions: {
-          type: 'boolean', required: false, description: "Include past collection versions."
+          type: 'boolean', required: false, default: true, description: "Include past collection versions.",
         },
       })
   end
@@ -44,30 +44,22 @@ class Arvados::V1::CollectionsController < ApplicationController
   end
 
   def find_objects_for_index
-    opts = {}
-    if params[:include_trash] || ['destroy', 'trash', 'untrash'].include?(action_name)
-      opts.update({include_trash: true})
-    end
-    if params[:include_old_versions] || @include_old_versions
-      opts.update({include_old_versions: true})
-    end
+    opts = {
+      include_trash: params[:include_trash] || ['destroy', 'trash', 'untrash'].include?(action_name),
+      include_old_versions: params[:include_old_versions] || false,
+    }
     @objects = Collection.readable_by(*@read_users, opts) if !opts.empty?
     super
   end
 
   def find_object_by_uuid
-    if params[:include_old_versions].nil?
-      @include_old_versions = true
-    else
-      @include_old_versions = params[:include_old_versions]
-    end
-
     if loc = Keep::Locator.parse(params[:id])
       loc.strip_hints!
 
-      opts = {}
-      opts.update({include_trash: true}) if params[:include_trash]
-      opts.update({include_old_versions: @include_old_versions})
+      opts = {
+        include_trash: params[:include_trash],
+        include_old_versions: params[:include_old_versions],
+      }
 
       # It matters which Collection object we pick because we use it to get signed_manifest_text,
       # the value of which is affected by the value of trash_at.
-- 
2.39.5