2891: Workbench current_user copes when API server is unreachable.

[arvados.git] / apps / workbench / app / views / layouts / application.html.erb

diff --git a/apps/workbench/app/views/layouts/application.html.erb b/apps/workbench/app/views/layouts/application.html.erb
index 3b3046e7ee1dd5a41f06864053dc040f3f608acd..3b4c7a2f749ba79e76bd4bb3b57bebde068aeaa1 100644 (file)
--- a/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@ -74,7 +74,6 @@
           </li>
           -->
 
-          <% if current_user %>
           <li class="dropdown notification-menu">
             <a href="#" class="dropdown-toggle" data-toggle="dropdown" id="notifications-menu">
               <span class="badge badge-alert notification-count"><%= @notification_count %></span>
@@ -97,7 +96,6 @@
               <% end %>
             </ul>
           </li>
-          <% end %>
 
           <li class="dropdown selection-menu">
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">
@@ -169,6 +167,7 @@
     </nav>
 
     <% if current_user.andand.is_active %>
+     <% begin %>
       <nav class="navbar navbar-default breadcrumbs" role="navigation">
         <ul class="nav navbar-nav navbar-left">
           <li class="dropdown">
@@ -193,6 +192,10 @@
           <% end %>
         </ul>
       </nav>
+     <% rescue ArvadosApiClient::NotLoggedInException %>
+       <% raise  # Let ApplicationController handle this. %>
+     <% rescue ArvadosApiClient::ApiError  # Just skip rendering projects.  %>
+     <% end %>
     <% end %>
 
     <div id="page-wrapper">