Merge branch '3605-node-info-field' refs #3605

[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 d6eca3a2155d2e7c50b58e030884fc5c8f323dcc..0697fefec596d55aa79e40cc419013c513456efb 100644 (file)
--- a/apps/workbench/app/views/application/show.html.erb
+++ b/apps/workbench/app/views/application/show.html.erb
@@ -1,25 +1,28 @@
 <% 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 !['Group','User', 'Collection'].include? @object.class.to_s # projects and collections handle it themselves %>
+    <%= render partial: 'name_and_description' %>
+  <% end %>
 
-<% 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) %>
+        <%= render_markup(@object.properties[:page_title] || @object.uuid) %>
       </h1>
-      
+
       <% if @object.properties[:page_subtitle] %>
         <h4>
-          <%= render_content_from_database @object.properties[:page_subtitle] %>
+          <%= render_markup @object.properties[:page_subtitle] %>
         </h4>
       <% end %>
 
-      <%= render_content_from_database @object.properties[:page_content] %>
+      <%= render_markup @object.properties[:page_content] %>
     <% end %>
   <% end %>
 <% end %>
@@ -27,4 +30,3 @@
 <% end %>
 
 <%= render partial: 'content', layout: 'content_layout', locals: {pane_list: controller.show_pane_list }%>
-