[ARVADOS] updated: 1.3.0-1006-g57eb9ae04

[Git user]

Summary of changes:
 .../controllers/arvados/v1/collections_controller.rb   |  2 +-
 .../app/controllers/arvados/v1/groups_controller.rb    |  2 +-
 services/api/app/models/container_request.rb           | 18 ++++++++++++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

       via  57eb9ae04ace45f70d2e0ceaeda3457062074b95 (commit)
      from  22722aab8f5aaf33d75975738d7e4f9c46150722 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 57eb9ae04ace45f70d2e0ceaeda3457062074b95
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Thu Jun 6 09:44:31 2019 -0300

    15306: Adds include_trash param definition to container requests.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at 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 7c7953ac9..c771fcea7 100644
--- 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 dcaeeb069..e0532fc71 100644
--- 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 c412e4b85..7a710f070 100644
--- 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 =
     [

-----------------------------------------------------------------------


hooks/post-receive
--