[ARVADOS] updated: 1.1.4-777-g5d9908601

[Git user]

Summary of changes:
 services/api/app/controllers/application_controller.rb       | 2 +-
 services/api/app/controllers/arvados/v1/groups_controller.rb | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

       via  5d9908601b8c16c556d0153640f67aa3b26c2f57 (commit)
       via  89698c15b13dcb151ebb673a2d73b1df7339c607 (commit)
      from  eb1c9afa9a92c1506e5d4d1161b6e74d919e8f00 (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 5d9908601b8c16c556d0153640f67aa3b26c2f57
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Thu Aug 16 15:25:39 2018 -0400

    13146: "included" is returned as_api_response.
    
    Fix applying column select to "included" records.
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/services/api/app/controllers/application_controller.rb b/services/api/app/controllers/application_controller.rb
index a30047687..a9134ad59 100644
--- a/services/api/app/controllers/application_controller.rb
+++ b/services/api/app/controllers/application_controller.rb
@@ -492,7 +492,7 @@ class ApplicationController < ActionController::Base
       :offset => @offset,
       :limit => @limit,
       :items => @objects.as_api_response(nil, {select: @select}),
-      :included => @extra_included
+      :included => @extra_included.as_api_response(nil, {select: @select}),
     }
     case params[:count]
     when nil, '', 'exact'
diff --git a/services/api/app/controllers/arvados/v1/groups_controller.rb b/services/api/app/controllers/arvados/v1/groups_controller.rb
index f8c24e7f5..f458d9fb9 100644
--- a/services/api/app/controllers/arvados/v1/groups_controller.rb
+++ b/services/api/app/controllers/arvados/v1/groups_controller.rb
@@ -105,8 +105,9 @@ class Arvados::V1::GroupsController < ApplicationController
 
     if params["include"] == "owner_uuid"
       @extra_included = []
-      @extra_included += Group.readable_by(*@read_users).where(uuid: owners).select(@select).to_a
-      @extra_included += User.readable_by(*@read_users).where(uuid: owners).select(@select).to_a
+      [Group, User].each do |klass|
+        @extra_included += klass.readable_by(*@read_users).where(uuid: owners).to_a
+      end
     end
 
     index

commit 89698c15b13dcb151ebb673a2d73b1df7339c607
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Thu Aug 16 15:08:13 2018 -0400

    13146: Apply select clause to included objects
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz 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 18a58c71f..f8c24e7f5 100644
--- a/services/api/app/controllers/arvados/v1/groups_controller.rb
+++ b/services/api/app/controllers/arvados/v1/groups_controller.rb
@@ -105,8 +105,8 @@ class Arvados::V1::GroupsController < ApplicationController
 
     if params["include"] == "owner_uuid"
       @extra_included = []
-      @extra_included += Group.readable_by(*@read_users).where(uuid: owners).to_a
-      @extra_included += User.readable_by(*@read_users).where(uuid: owners).to_a
+      @extra_included += Group.readable_by(*@read_users).where(uuid: owners).select(@select).to_a
+      @extra_included += User.readable_by(*@read_users).where(uuid: owners).select(@select).to_a
     end
 
     index

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


hooks/post-receive
--