15306: Moves include_trash param declaration to the controller.

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

diff --git a/services/api/app/controllers/arvados/v1/container_requests_controller.rb b/services/api/app/controllers/arvados/v1/container_requests_controller.rb
index 47ea16e34200a3a382e9059812495288709c5e83..3d5d4616ef0ace8783357c4f041c1a491cbd6615 100644 (file)
--- a/services/api/app/controllers/arvados/v1/container_requests_controller.rb
+++ b/services/api/app/controllers/arvados/v1/container_requests_controller.rb
@@ -10,4 +10,22 @@ class Arvados::V1::ContainerRequestsController < ApplicationController
   accept_attribute_as_json :filters, Array
   accept_attribute_as_json :scheduling_parameters, Hash
   accept_attribute_as_json :secret_mounts, Hash
+
+  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
 end

diff --git a/services/api/app/models/container_request.rb b/services/api/app/models/container_request.rb
index 7a710f070dc618b4863c5a2260f167c3c5914656..c412e4b8500c141617b18de64007078f7b715c4d 100644 (file)
--- a/services/api/app/models/container_request.rb
+++ b/services/api/app/models/container_request.rb
@@ -76,24 +76,6 @@ 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 =
     [