X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/a959f21c8147f26362df392bc3fd3290db69de85..1966eff7c92733225cd9fe1a4121ae0b8f1153d3:/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 d6eca3a215..97922e8331 100644 --- 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 %>

<%= render_content_from_database(@object.properties[:page_title] || @object.uuid) %>

- + <% if @object.properties[:page_subtitle] %>

<%= render_content_from_database @object.properties[:page_subtitle] %> @@ -27,4 +27,3 @@ <% end %> <%= render partial: 'content', layout: 'content_layout', locals: {pane_list: controller.show_pane_list }%> -