[ARVADOS] updated: 1.3.0-1003-g18ae48a2e

[Git user]

Summary of changes:
 .../api/app/controllers/arvados/v1/groups_controller.rb |  9 +++++++++
 .../functional/arvados/v1/groups_controller_test.rb     | 17 +++++++++++++++++
 2 files changed, 26 insertions(+)

       via  18ae48a2e9858fdbbe96d7fb0141397310c6044f (commit)
       via  a0b36ed86d499b53c442a0050d694d7a3ce35ed5 (commit)
      from  b3d5254ce24ca82904b13d61012b2d8d676a30d8 (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 18ae48a2e9858fdbbe96d7fb0141397310c6044f
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Wed Jun 5 10:08:10 2019 -0300

    15306: Fixes issue on groups controller.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --git a/services/api/app/controllers/arvados/v1/groups_controller.rb b/services/api/app/controllers/arvados/v1/groups_controller.rb
index 1004f0702..dcaeeb069 100644
--- a/services/api/app/controllers/arvados/v1/groups_controller.rb
+++ b/services/api/app/controllers/arvados/v1/groups_controller.rb
@@ -19,6 +19,15 @@ class Arvados::V1::GroupsController < ApplicationController
       })
   end
 
+  def self._show_requires_parameters
+    (super rescue {}).
+      merge({
+        include_trash: {
+          type: 'boolean', required: false, description: "Include items whose is_trashed attribute is true."
+        },
+      })
+  end
+
   def self._contents_requires_parameters
     params = _index_requires_parameters.
       merge({

commit a0b36ed86d499b53c442a0050d694d7a3ce35ed5
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Wed Jun 5 10:07:44 2019 -0300

    15306: Adds similar test to groups, exposing the same issue as collections.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --git a/services/api/test/functional/arvados/v1/groups_controller_test.rb b/services/api/test/functional/arvados/v1/groups_controller_test.rb
index cefb7f383..4618305b3 100644
--- a/services/api/test/functional/arvados/v1/groups_controller_test.rb
+++ b/services/api/test/functional/arvados/v1/groups_controller_test.rb
@@ -591,6 +591,23 @@ class Arvados::V1::GroupsControllerTest < ActionController::TestCase
         end
       end
 
+      test "show include_trash=false #{project} #{untrash} as #{auth}" do
+        authorize_with auth
+        untrash.each do |pr|
+          Group.find_by_uuid(groups(pr).uuid).update! is_trashed: false
+        end
+        get :show, params: {
+              id: groups(project).uuid,
+              format: :json,
+              include_trash: false
+            }
+        if visible
+          assert_response :success
+        else
+          assert_response 404
+        end
+      end
+
       test "show include_trash #{project} #{untrash} as #{auth}" do
         authorize_with auth
         untrash.each do |pr|

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


hooks/post-receive
--