Merge branch 'master' into 3112-report-bug

[arvados.git] / apps / workbench / app / controllers / user_agreements_controller.rb

diff --git a/apps/workbench/app/controllers/user_agreements_controller.rb b/apps/workbench/app/controllers/user_agreements_controller.rb
index cc0d3c819253a8fd68dff9f6a584e941ac60dbad..f8c316e58c7606c086a6e91132f14c381e02f1e8 100644 (file)
--- a/apps/workbench/app/controllers/user_agreements_controller.rb
+++ b/apps/workbench/app/controllers/user_agreements_controller.rb
@@ -1,6 +1,13 @@
 class UserAgreementsController < ApplicationController
   skip_before_filter :check_user_agreements
   skip_before_filter :find_object_by_uuid
+  skip_before_filter :check_user_profile
+
+  def index
+    if unsigned_user_agreements.empty?
+      redirect_to(params[:return_to] || :back)
+    end
+  end
 
   def model_class
     Collection
@@ -8,7 +15,7 @@ class UserAgreementsController < ApplicationController
 
   def sign
     params[:checked].each do |checked|
-      if r = checked.match(/^([0-9a-f]+)/)
+      if r = checked.match(/^([0-9a-f]+[^\/]*)/)
         UserAgreement.sign uuid: r[1]
       end
     end