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 97922e8331ad03d644ac0575baae8b9c2f133927..0697fefec596d55aa79e40cc419013c513456efb 100644 (file)
--- a/apps/workbench/app/views/application/show.html.erb
+++ b/apps/workbench/app/views/application/show.html.erb
@@ -5,21 +5,24 @@
 <% 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 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 %>