Merge branch '13668-api-wb-package-version'

[arvados.git] / services / api / app / controllers / arvados / v1 / groups_controller.rb

diff --git a/services/api/app/controllers/arvados/v1/groups_controller.rb b/services/api/app/controllers/arvados/v1/groups_controller.rb
index 9e0cdf899ef9dcbb8cb15d1e9aa1567f7e3c3f03..ec3b69ab052506b54798689d168fb136e0e33321 100644 (file)
--- a/services/api/app/controllers/arvados/v1/groups_controller.rb
+++ b/services/api/app/controllers/arvados/v1/groups_controller.rb
@@ -163,13 +163,9 @@ class Arvados::V1::GroupsController < ApplicationController
         end
       end.compact
 
-      if klass == Collection and params[:include_trash]
-        @objects = klass.unscoped.readable_by(*@read_users, {:include_trash => params[:include_trash]}).
-          order(request_order).where(where_conds)
-      else
-        @objects = klass.readable_by(*@read_users, {:include_trash => params[:include_trash]}).
-          order(request_order).where(where_conds)
-      end
+      @objects = klass.readable_by(*@read_users, {:include_trash => params[:include_trash]}).
+                 order(request_order).where(where_conds)
+
       klass_limit = limit_all - all_objects.count
       @limit = klass_limit
       apply_where_limit_order_params klass