[ARVADOS] updated: b0f05799524fc5efaf04e19b7cc7c9345ace4cce

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/views/layouts/application.html.erb | 10 +++++-----
 services/api/app/models/job.rb                        |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

       via  b0f05799524fc5efaf04e19b7cc7c9345ace4cce (commit)
       via  97acb054af9a196a6732ad11520974ffff3946d0 (commit)
       via  24e88096f931535d9954f19b47d4ec5dd42a8693 (commit)
      from  a614455f3b617326e2dc616bc08e28f9d7f9fb8c (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 b0f05799524fc5efaf04e19b7cc7c9345ace4cce
Author: radhika <radhika at curoverse.com>
Date:   Fri Jun 20 11:02:57 2014 -0400

    2659: anonymous user related ui elements should be included only when anonymous user configuration is enabled. otherwise, previous behavior should continue to be used.

diff --git a/apps/workbench/app/views/layouts/application.html.erb b/apps/workbench/app/views/layouts/application.html.erb
index 9d36ea0..5194abc 100644
--- a/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@ -53,7 +53,7 @@
           <span class="icon-bar"></span>
         </button>
         <a class="navbar-brand" href="/"><%= Rails.configuration.site_name.downcase rescue Rails.application.class.parent_name %>
-          <% if current_user && !current_user.is_active %> . You are viewing public data. <% end %>
+          <% if current_user && !current_user.is_active && anonymous_login_enabled %> . You are viewing public data. <% end %>
         </a>
       </div>
 
@@ -90,11 +90,11 @@
               <li role="presentation" class="divider"></li>
               <% end %>
 
-              <% if !current_user.is_active %> 
+              <% if anonymous_login_enabled && !current_user.is_active %> 
                 <% if !current_user.is_invited %>
-                  <li role="presentation"><a href="/users/inactive" role="menuitem"><i class="fa fa-fw"></i> Inactive </a></li>
+                  <li role="presentation"><a href="/users/welcome" role="menuitem"><i class="fa fa-sign-out fa-fw"></i> Inactive </a></li>
                 <% else %>
-                  <li role="presentation"><a href="/user_agreements" role="menuitem"><i class="fa fa-fw"></i> Inactive </a></li>
+                  <li role="presentation"><a href="/user_agreements/index" role="menuitem"><i class="fa fa-sign-out fa-fw"></i> Inactive </a></li>
                 <% end %>
               <% end %>
 
@@ -176,7 +176,7 @@
       </div><!-- /.navbar-collapse -->
     </nav>
 
-    <% if current_user.andand.is_active || (current_user && anonymous_login_enabled)%>
+    <% if current_user.andand.is_active || (current_user && is_anonymous(current_user))%>
       <nav class="navbar navbar-default breadcrumbs" role="navigation">
         <ul class="nav navbar-nav navbar-left">
           <li class="dropdown">

commit 97acb054af9a196a6732ad11520974ffff3946d0
Merge: a614455 24e8809
Author: radhika <radhika at curoverse.com>
Date:   Fri Jun 20 10:49:41 2014 -0400

    Merge branch 'master' into 2659-anonymous-group


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


hooks/post-receive
--