Merge branch '3504-clients-compatible-with-3036' refs #3504

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

diff --git a/apps/workbench/app/views/application/show.html.erb b/apps/workbench/app/views/application/show.html.erb
index 105e1c356d69f140cc7bcc6cbf0a4069a9be2e61..97922e8331ad03d644ac0575baae8b9c2f133927 100644 (file)
--- a/apps/workbench/app/views/application/show.html.erb
+++ b/apps/workbench/app/views/application/show.html.erb
@@ -1,18 +1,18 @@
 <% content_for :page_title do %>
-  <%= (@object.respond_to?(:properties) ? @object.properties[:page_title] : nil) ||
+  <%= (@object.respond_to?(:properties) and !@object.properties.nil? ? @object.properties[:page_title] : nil) ||
       @name_link.andand.name ||
       @object.friendly_link_name %>
 <% end %>
 
 <% content_for :content_top do %>
 
-<% if @object.respond_to? :properties %>
+<% if @object.respond_to? :properties and !@object.properties.nil? %>
   <% if @object.properties[:page_content] %>
     <% content_for :page_content do %>
       <h1>
         <%= render_content_from_database(@object.properties[:page_title] || @object.uuid) %>
       </h1>
-      
+
       <% if @object.properties[:page_subtitle] %>
         <h4>
           <%= render_content_from_database @object.properties[:page_subtitle] %>