Rename include_managed to include_indirect.

diff --git a/services/api/app/controllers/application_controller.rb b/services/api/app/controllers/application_controller.rb
index 9826ee97226decc968974d80aebc25a11b999185..2e3c4ebd30bc595a2acad73dbfcda510a39cc342 100644 (file)
--- a/services/api/app/controllers/application_controller.rb
+++ b/services/api/app/controllers/application_controller.rb
@@ -62,7 +62,7 @@ class ApplicationController < ActionController::Base
   def self._owned_items_requires_parameters
     _index_requires_parameters.
       merge({
-              include_managed: {
+              include_indirect: {
                 type: 'boolean', required: false, default: false
               },
             })
@@ -98,7 +98,7 @@ class ApplicationController < ActionController::Base
         @objects = klass.readable_by(current_user)
         cond_sql = "#{klass.table_name}.owner_uuid = ?"
         cond_params = [@object.uuid]
-        if params[:include_managed]
+        if params[:include_indirect]
           @objects = @objects.
             joins("LEFT JOIN links mng_links"\
                   " ON mng_links.link_class=#{klass.sanitize 'permission'}"\

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 f2ec6490299d8a9d2c37a57a5bf35466101bd22d..d9cbac0a129b252df1713df992bf50bc3dc9ba25 100644 (file)
--- a/services/api/test/functional/arvados/v1/groups_controller_test.rb
+++ b/services/api/test/functional/arvados/v1/groups_controller_test.rb
@@ -75,7 +75,7 @@ class Arvados::V1::GroupsControllerTest < ActionController::TestCase
     assert_equal 0, jresponse['items_available']
   end
 
-  test 'get group-owned objects without include_managed' do
+  test 'get group-owned objects without include_indirect' do
     unexpected_uuid = specimens(:in_afolder_linked_from_asubfolder).uuid
     authorize_with :active
     get :owned_items, {
@@ -87,12 +87,12 @@ class Arvados::V1::GroupsControllerTest < ActionController::TestCase
     assert_equal nil, uuids.index(unexpected_uuid)
   end
 
-  test 'get group-owned objects with include_managed' do
+  test 'get group-owned objects with include_indirect' do
     expected_uuid = specimens(:in_afolder_linked_from_asubfolder).uuid
     authorize_with :active
     get :owned_items, {
       id: groups(:asubfolder).uuid,
-      include_managed: true,
+      include_indirect: true,
       format: :json,
     }
     assert_response :success

diff --git a/services/api/test/functional/arvados/v1/users_controller_test.rb b/services/api/test/functional/arvados/v1/users_controller_test.rb
index e805b24c18ba6751096c8786dce864719270917e..2639516f4b77242ed5a2a2ad10c86229738d4710 100644 (file)
--- a/services/api/test/functional/arvados/v1/users_controller_test.rb
+++ b/services/api/test/functional/arvados/v1/users_controller_test.rb
@@ -896,8 +896,8 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase
     assert_equal expect_kinds, (expect_kinds & kinds)
   end
 
-  [false, true].each do |inc_mgd|
-    test "get all pages of user-owned #{'and -managed ' if inc_mgd}objects" do
+  [false, true].each do |inc_ind|
+    test "get all pages of user-owned #{'and -indirect ' if inc_ind}objects" do
       authorize_with :active
       limit = 5
       offset = 0
@@ -910,7 +910,7 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase
         @jresponse = nil
         get :owned_items, {
           id: users(:active).uuid,
-          include_managed: inc_mgd,
+          include_indirect: inc_ind,
           limit: limit,
           offset: offset,
           format: :json,
@@ -930,15 +930,15 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase
           uuid_received[uuid] = true
           owner_received[item['owner_uuid']] = true
           offset += 1
-          if not inc_mgd
+          if not inc_ind
             assert_equal users(:active).uuid, item['owner_uuid']
           end
         end
         break if offset >= items_available
       end
-      if inc_mgd
+      if inc_ind
         assert_operator 0, :<, (jresponse.keys - [users(:active).uuid]).count,
-        "Set include_managed=true but did not receive any managed items"
+        "Set include_indirect=true but did not receive any indirect items"
       end
     end
   end