[ARVADOS] updated: 8012f6cc74ca6e39d6f4bbf097a66eee19f0c4da

git at public.curoverse.com git at public.curoverse.com
Thu Sep 11 15:05:46 EDT 2014


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

       via  8012f6cc74ca6e39d6f4bbf097a66eee19f0c4da (commit)
      from  f2bed1a9d44ccee1a5e1214e139d586b60b90e6a (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 8012f6cc74ca6e39d6f4bbf097a66eee19f0c4da
Author: Ward Vandewege <ward at curoverse.com>
Date:   Thu Sep 11 15:01:41 2014 -0400

    Fallout from #3036: the test for the checkbox value on acceptance of the
    user agreement was expecting a keep hash, rather than an Arvados UUID.
    
    This fixes accepting the user agreement (if one or more are present).
    
    refs #3036

diff --git a/apps/workbench/app/controllers/user_agreements_controller.rb b/apps/workbench/app/controllers/user_agreements_controller.rb
index f8c316e..bec11f2 100644
--- a/apps/workbench/app/controllers/user_agreements_controller.rb
+++ b/apps/workbench/app/controllers/user_agreements_controller.rb
@@ -15,7 +15,7 @@ class UserAgreementsController < ApplicationController
 
   def sign
     params[:checked].each do |checked|
-      if r = checked.match(/^([0-9a-f]+[^\/]*)/)
+      if (r = CollectionsHelper.match_uuid_with_optional_filepath(checked))
         UserAgreement.sign uuid: r[1]
       end
     end

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list