[ARVADOS] updated: 2def202591164c9ade2c2b7ab6f67dc892d10557

git at public.curoverse.com git at public.curoverse.com
Thu Oct 23 13:53:36 EDT 2014


Summary of changes:
 apps/workbench/app/controllers/collections_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

       via  2def202591164c9ade2c2b7ab6f67dc892d10557 (commit)
      from  11085f87c952c7e46a15c88e144190cac32b95a8 (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 2def202591164c9ade2c2b7ab6f67dc892d10557
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Oct 23 13:53:31 2014 -0400

    Increase limit for collections controller querying same portable_data_hash as
    workaround to fix tests, refs #4058, but really needs a proper fix, refs #3400

diff --git a/apps/workbench/app/controllers/collections_controller.rb b/apps/workbench/app/controllers/collections_controller.rb
index 263f67f..4e0008d 100644
--- a/apps/workbench/app/controllers/collections_controller.rb
+++ b/apps/workbench/app/controllers/collections_controller.rb
@@ -205,7 +205,7 @@ class CollectionsController < ApplicationController
     return super if !@object
     if current_user
       if Keep::Locator.parse params["uuid"]
-        @same_pdh = Collection.filter([["portable_data_hash", "=", @object.portable_data_hash]])
+        @same_pdh = Collection.filter([["portable_data_hash", "=", @object.portable_data_hash]]).limit(1000)
         if @same_pdh.results.size == 1
           redirect_to collection_path(@same_pdh[0]["uuid"])
           return

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list