[ARVADOS] updated: bfc0652a9bbc650688a393596355392ead16dbbb

[git at public.curoverse.com]

Summary of changes:
 .../app/views/layouts/application.html.erb         |   16 ++++++++++------
 services/api/app/models/user.rb                    |    6 +++---
 2 files changed, 13 insertions(+), 9 deletions(-)

       via  bfc0652a9bbc650688a393596355392ead16dbbb (commit)
       via  e1f7ea951ed4a661c68ce0168650f44d41240a06 (commit)
      from  8d1ee366554c12b5746f39b34a46055ed431a7ef (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 bfc0652a9bbc650688a393596355392ead16dbbb
Author: Tom Clegg <tom at curoverse.com>
Date:   Sat Feb 15 17:30:21 2014 -0800

    Return only true or false for is_invited, never group uuid.

diff --git a/services/api/app/models/user.rb b/services/api/app/models/user.rb
index ccf8ac4..a85a63d 100644
--- a/services/api/app/models/user.rb
+++ b/services/api/app/models/user.rb
@@ -30,9 +30,9 @@ class User < ArvadosModel
   end
 
   def is_invited
-    (self.is_active ||
-     Rails.configuration.new_users_are_active ||
-     self.groups_i_can(:read).select { |x| x.match /-f+$/ }.first)
+    !!(self.is_active ||
+       Rails.configuration.new_users_are_active ||
+       self.groups_i_can(:read).select { |x| x.match /-f+$/ }.first)
   end
 
   def groups_i_can(verb)

commit e1f7ea951ed4a661c68ce0168650f44d41240a06
Author: Tom Clegg <tom at curoverse.com>
Date:   Sat Feb 15 17:29:38 2014 -0800

    Hide top nav notifications and links to tokens/keys pages until user
    is active.
    
    closes #2188

diff --git a/apps/workbench/app/views/layouts/application.html.erb b/apps/workbench/app/views/layouts/application.html.erb
index afa9037..0b6cd66 100644
--- a/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@ -31,7 +31,7 @@
     body > div.container-fluid {
     padding-top: 70px; /* 70px to make the container go all the way to the bottom of the navbar */
     }
-    
+
     body > div.container-fluid > div.col-sm-9.col-sm-offset-3 {
     overflow: auto;
     }
@@ -99,7 +99,7 @@
         <% end %>
         <% end %>
       </ul>
-  
+
       <ul class="nav navbar-nav navbar-right">
 
         <li>
@@ -128,9 +128,10 @@
           <ul class="dropdown-menu" role="menu">
               <li style="padding: 10px">No selections.</li>
           </ul>
-        </li>        
+        </li>
         -->
 
+        <% if current_user.is_active %>
         <li class="dropdown notification-menu">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown">
             <span class="glyphicon glyphicon-envelope"></span>
@@ -147,7 +148,8 @@
               <li class="notification empty">No notifications.</li>
             <% end %>
           </ul>
-        </li>        
+        </li>
+        <% end %>
 
         <li class="dropdown">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown">
@@ -155,10 +157,12 @@
           </a>
           <ul class="dropdown-menu" role="menu">
             <li role="presentation" class="dropdown-header"><%= current_user.email %></li>
+            <% if current_user.is_active %>
             <li role="presentation" class="divider"></li>
             <li role="presentation"><a href="/authorized_keys" role="menuitem">Manage ssh keys</a></li>
             <li role="presentation"><a href="/api_client_authorizations" role="menuitem">Manage API tokens</a></li>
             <li role="presentation" class="divider"></li>
+            <% end %>
             <li role="presentation"><a href="<%= logout_path %>" role="menuitem">Log out</a></li>
           </ul>
         </li>
@@ -184,7 +188,7 @@
           <li class="<%= 'arvados-nav-active' if params[:action] == 'home' %>">
             <a href="/">Dashboard</a>
           </li>
-          
+
           <% [['Data', [['humans'],
                         ['traits'],
                         ['specimens'],
@@ -198,7 +202,7 @@
               ['System', [['users'],
                          ['groups'],
                          ['nodes', 'Compute nodes'],
-                         ['keep_disks']]]].each do |j| %>   
+                         ['keep_disks']]]].each do |j| %>
             <li><%= j[0] %>
               <ul>
               <% j[1].each do |k| %>

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


hooks/post-receive
--