[ARVADOS] updated: 8d40a99f977c616499f49b5152308875bec1c59c

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/controllers/application_controller.rb     | 1 +
 apps/workbench/app/controllers/user_agreements_controller.rb | 4 ++--
 apps/workbench/app/controllers/user_sessions_controller.rb   | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

       via  8d40a99f977c616499f49b5152308875bec1c59c (commit)
      from  81c352f7deee9764811ada69878d8d69ce4cb674 (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 8d40a99f977c616499f49b5152308875bec1c59c
Author: radhika <radhika at curoverse.com>
Date:   Tue Jun 24 10:17:32 2014 -0400

    2659: topnav when logged out

diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index 3537142..643369f 100644
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -376,6 +376,7 @@ class ApplicationController < ActionController::Base
   def thread_clear
     Thread.current[:arvados_api_token] = nil
     Thread.current[:user] = nil
+    Thread.current[:arvados_anonymous_api_token] = nil
     Rails.cache.delete_matched(/^request_#{Thread.current.object_id}_/)
     yield
     Rails.cache.delete_matched(/^request_#{Thread.current.object_id}_/)
diff --git a/apps/workbench/app/controllers/user_agreements_controller.rb b/apps/workbench/app/controllers/user_agreements_controller.rb
index c889486..0ba2b53 100644
--- a/apps/workbench/app/controllers/user_agreements_controller.rb
+++ b/apps/workbench/app/controllers/user_agreements_controller.rb
@@ -1,8 +1,8 @@
 class UserAgreementsController < ApplicationController
-  skip_before_filter :check_user_agreements
-  skip_before_filter :find_object_by_uuid
   skip_before_filter :permit_anonymous_browsing_if_no_thread_token
   skip_before_filter :permit_anonymous_browsing_for_inactive_user
+  skip_before_filter :check_user_agreements
+  skip_before_filter :find_object_by_uuid
   def model_class
     Collection
   end
diff --git a/apps/workbench/app/controllers/user_sessions_controller.rb b/apps/workbench/app/controllers/user_sessions_controller.rb
index ec2481b..5edb506 100644
--- a/apps/workbench/app/controllers/user_sessions_controller.rb
+++ b/apps/workbench/app/controllers/user_sessions_controller.rb
@@ -1,8 +1,9 @@
 class UserSessionsController < ApplicationController
 
+skip_filter :permit_anonymous_browsing_if_no_thread_token, only: [:logged_out]
 skip_filter :set_thread_api_token, only: [:logged_out]
 skip_filter :require_thread_api_token, only: [:logged_out]
-skip_filter :use_anonymous_token_if_necessary, only: [:logged_out]
+skip_filter :permit_anonymous_browsing_for_inactive_user, only: [:logged_out]
 skip_filter :check_user_agreements, only: [:logged_out]
 skip_filter :check_user_notifications, only: [:logged_out]
 skip_filter :find_object_by_uuid, only: [:logged_out]

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


hooks/post-receive
--