Switch from no_count to count to avoid issues with arv CLI / trollop

diff --git a/services/api/app/controllers/application_controller.rb b/services/api/app/controllers/application_controller.rb
index ffbef1852b7a126a08900e6992b51dcf33830ef2..1114ae14dfb5b765d162755261386fe2ed332d92 100644 (file)
--- a/services/api/app/controllers/application_controller.rb
+++ b/services/api/app/controllers/application_controller.rb
@@ -482,7 +482,7 @@ class ApplicationController < ActionController::Base
       :limit => @limit,
       :items => @objects.as_api_response(nil, {select: @select})
     }
-    if params[:no_count].nil? || !params[:no_count]
+    if params[:count].nil? || params[:count]
       if @objects.respond_to? :except
         list[:items_available] = @objects.
           except(:limit).except(:offset).
@@ -550,7 +550,7 @@ class ApplicationController < ActionController::Base
       distinct: { type: 'boolean', required: false },
       limit: { type: 'integer', required: false, default: DEFAULT_LIMIT },
       offset: { type: 'integer', required: false, default: 0 },
-      no_count: { type: 'boolean', required: false, default: false },
+      count: { type: 'boolean', required: false, default: true},
     }
   end
 

diff --git a/services/api/app/controllers/arvados/v1/schema_controller.rb b/services/api/app/controllers/arvados/v1/schema_controller.rb
index a2f5c182096fb5ad866366bd71b8a0a370cb30d6..3952db61b08d3c458580893f2c6a49ef85df43aa 100644 (file)
--- a/services/api/app/controllers/arvados/v1/schema_controller.rb
+++ b/services/api/app/controllers/arvados/v1/schema_controller.rb
@@ -254,9 +254,10 @@ class Arvados::V1::SchemaController < ApplicationController
                   description: "Return each distinct object.",
                   location: "query"
                 },
-                no_count: {
+                count: {
                   type: "boolean",
-                  description: "Don't count items_available.",
+                  description: "Count items_available.",
+                  default: "true",
                   location: "query"
                 }
               },