[ARVADOS] updated: fe098b887198e2eae3a90d2abbff26115ee916f1

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/controllers/application_controller.rb | 5 ++++-
 apps/workbench/app/views/layouts/application.html.erb    | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

       via  fe098b887198e2eae3a90d2abbff26115ee916f1 (commit)
       via  0ecb0ed432c9be0a27784680b34a49e8ae92f653 (commit)
       via  5fe0740abf9727a7941701c326a20799657bf539 (commit)
      from  b0f05799524fc5efaf04e19b7cc7c9345ace4cce (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 fe098b887198e2eae3a90d2abbff26115ee916f1
Author: radhika <radhika at curoverse.com>
Date:   Fri Jun 20 11:34:33 2014 -0400

    2659: Project dropdown menu should appear when anonymous user login is being used.

diff --git a/apps/workbench/app/views/layouts/application.html.erb b/apps/workbench/app/views/layouts/application.html.erb
index 5194abc..dc36d54 100644
--- a/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@ -176,7 +176,7 @@
       </div><!-- /.navbar-collapse -->
     </nav>
 
-    <% if current_user.andand.is_active || (current_user && is_anonymous(current_user))%>
+    <% if current_user.andand.is_active || (current_user && anonymous_login_enabled)%>
       <nav class="navbar navbar-default breadcrumbs" role="navigation">
         <ul class="nav navbar-nav navbar-left">
           <li class="dropdown">

commit 0ecb0ed432c9be0a27784680b34a49e8ae92f653
Author: radhika <radhika at curoverse.com>
Date:   Fri Jun 20 11:30:17 2014 -0400

    2659: logout and relogin should work with anonymous behavior correctly. need to reset logout referrer session attribute.

diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index 4e5b4da..531f286 100644
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -473,7 +473,8 @@ class ApplicationController < ActionController::Base
 
   def check_anonymous_token
     if session['arv-referrer'] == 'logout'
-      # do not use anonymous user token and let logout happen
+      # Do not use anonymous user token and let logout happen. But clear it for future relogins.
+      session['arv-referrer'] = nil
       return
     end
 

commit 5fe0740abf9727a7941701c326a20799657bf539
Author: radhika <radhika at curoverse.com>
Date:   Fri Jun 20 11:16:22 2014 -0400

    2659: add comment to anonymous_login_enabled helper method

diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index 4db0897..4e5b4da 100644
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -929,6 +929,8 @@ class ApplicationController < ActionController::Base
   end
   helper_method :anonymous_login_enabled
   def anonymous_login_enabled
+    # to avoid the case where bogus anonymous token is configured,
+    # safer to check this object which is set after token verification
     return @@anonymous_user
   end
 

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


hooks/post-receive
--