[ARVADOS] created: 83369774c123b427f519bd2a2229415fac383a6a

[git at public.curoverse.com]

        at  83369774c123b427f519bd2a2229415fac383a6a (commit)


commit 83369774c123b427f519bd2a2229415fac383a6a
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Nov 6 22:28:00 2014 -0500

    3400: Remove ArvadosResourceList#all

diff --git a/apps/workbench/app/controllers/users_controller.rb b/apps/workbench/app/controllers/users_controller.rb
index 9f8f609..43a8895 100644
--- a/apps/workbench/app/controllers/users_controller.rb
+++ b/apps/workbench/app/controllers/users_controller.rb
@@ -35,7 +35,7 @@ class UsersController < ApplicationController
 
   def activity
     @breadcrumb_page_name = nil
-    @users = User.limit(params[:limit]).all
+    @users = User.limit(params[:limit])
     @user_activity = {}
     @activity = {
       logins: {},
@@ -88,7 +88,7 @@ class UsersController < ApplicationController
 
   def storage
     @breadcrumb_page_name = nil
-    @users = User.limit(params[:limit]).all
+    @users = User.limit(params[:limit])
     @user_storage = {}
     total_storage = {}
     @log_date = {}
diff --git a/apps/workbench/app/models/arvados_base.rb b/apps/workbench/app/models/arvados_base.rb
index f5be0e1..bc5a9a3 100644
--- a/apps/workbench/app/models/arvados_base.rb
+++ b/apps/workbench/app/models/arvados_base.rb
@@ -139,8 +139,8 @@ class ArvadosBase < ActiveRecord::Base
     ArvadosResourceList.new(self).eager(*args)
   end
 
-  def self.all(*args)
-    ArvadosResourceList.new(self).all(*args)
+  def self.all
+    ArvadosResourceList.new(self)
   end
 
   def self.permit_attribute_params raw_params
diff --git a/apps/workbench/app/models/arvados_resource_list.rb b/apps/workbench/app/models/arvados_resource_list.rb
index eab2c51..41521c9 100644
--- a/apps/workbench/app/models/arvados_resource_list.rb
+++ b/apps/workbench/app/models/arvados_resource_list.rb
@@ -96,11 +96,6 @@ class ArvadosResourceList
     @results
   end
 
-  def all
-    results
-    self
-  end
-
   def to_ary
     results
   end
diff --git a/apps/workbench/test/unit/arvados_resource_list_test.rb b/apps/workbench/test/unit/arvados_resource_list_test.rb
index 7a9a7d5..dac6a74 100644
--- a/apps/workbench/test/unit/arvados_resource_list_test.rb
+++ b/apps/workbench/test/unit/arvados_resource_list_test.rb
@@ -49,7 +49,7 @@ class ResourceListTest < ActiveSupport::TestCase
   test 'prefetch all items' do
     use_token :admin
     a = 0
-    Collection.where(owner_uuid: 'zzzzz-j7d0g-0201collections').all.each do
+    Collection.where(owner_uuid: 'zzzzz-j7d0g-0201collections').each do
       a += 1
     end
     assert_equal 201, a

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


hooks/post-receive
--