15306: Adds include_trash param definition to container requests.

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>

diff --git a/services/api/app/controllers/arvados/v1/collections_controller.rb b/services/api/app/controllers/arvados/v1/collections_controller.rb
index 7c7953ac9bb4d3daf4412d494e3e9619cfd7ad28..c771fcea796872541b59921badb5966601b5069c 100644 (file)
--- a/services/api/app/controllers/arvados/v1/collections_controller.rb
+++ b/services/api/app/controllers/arvados/v1/collections_controller.rb
@@ -25,7 +25,7 @@ class Arvados::V1::CollectionsController < ApplicationController
     (super rescue {}).
       merge({
         include_trash: {
-          type: 'boolean', required: false, description: "Include collections whose is_trashed attribute is true."
+          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."

diff --git a/services/api/app/controllers/arvados/v1/groups_controller.rb b/services/api/app/controllers/arvados/v1/groups_controller.rb
index dcaeeb069d6f58e8ddf379778b87b0a4cd67f093..e0532fc715caa7003bea91fc8fd90c0ae95474b7 100644 (file)
--- a/services/api/app/controllers/arvados/v1/groups_controller.rb
+++ b/services/api/app/controllers/arvados/v1/groups_controller.rb
@@ -23,7 +23,7 @@ class Arvados::V1::GroupsController < ApplicationController
     (super rescue {}).
       merge({
         include_trash: {
-          type: 'boolean', required: false, description: "Include items whose is_trashed attribute is true."
+          type: 'boolean', required: false, description: "Show group/project even if its is_trashed attribute is true."
         },
       })
   end

diff --git a/services/api/app/models/container_request.rb b/services/api/app/models/container_request.rb
index c412e4b8500c141617b18de64007078f7b715c4d..7a710f070dc618b4863c5a2260f167c3c5914656 100644 (file)
--- a/services/api/app/models/container_request.rb
+++ b/services/api/app/models/container_request.rb
@@ -76,6 +76,24 @@ class ContainerRequest < ArvadosModel
     t.add :use_existing
   end
 
+  def self._index_requires_parameters
+    (super rescue {}).
+      merge({
+        include_trash: {
+          type: 'boolean', required: false, description: "Include container requests whose owner project is trashed."
+        },
+      })
+  end
+
+  def self._show_requires_parameters
+    (super rescue {}).
+      merge({
+        include_trash: {
+          type: 'boolean', required: false, description: "Show container request even if its owner project is trashed."
+        },
+      })
+  end
+
   # Supported states for a container request
   States =
     [