3354: Rename render_content_from_database helper to render_markup, as a more directly...

diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index d2f4ed44b240990b5c611c34d0103a478924c7f4..aaf1ae0cb181a41b3ded4d55e46e41a2b058431e 100644 (file)
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -205,7 +205,7 @@ class ApplicationController < ActionController::Base
       f.json do
         extra_attrs = { href: url_for(action: :show, id: @object) }
         @object.textile_attributes.each do |textile_attr|
-          extra_attrs.merge!({ "#{textile_attr}Textile" => view_context.render_content_from_database(@object.attributes[textile_attr]) })
+          extra_attrs.merge!({ "#{textile_attr}Textile" => view_context.render_markup(@object.attributes[textile_attr]) })
         end
         render json: @object.attributes.merge(extra_attrs)
       end

diff --git a/apps/workbench/app/helpers/application_helper.rb b/apps/workbench/app/helpers/application_helper.rb
index a219cd5cc3423820ea3c029e6c6c78e57ca24095..de7fd17c09c6b0100dec2ce26589c74b0fa2d190 100644 (file)
--- a/apps/workbench/app/helpers/application_helper.rb
+++ b/apps/workbench/app/helpers/application_helper.rb
@@ -11,7 +11,7 @@ module ApplicationHelper
     Rails.configuration.arvados_v1_base.gsub /https?:\/\/|\/arvados\/v1/,''
   end
 
-  def render_content_from_database(markup)
+  def render_markup(markup)
     raw RedCloth.new(markup.to_s).to_html(:refs_arvados, :textile) if markup
   end
 
@@ -455,6 +455,6 @@ private
   end
 
   def render_textile_if_textile( object, attr, attrvalue )
-    is_textile?( object, attr ) ? render_content_from_database(attrvalue) : attrvalue
+    is_textile?( object, attr ) ? render_markup(attrvalue) : attrvalue
   end
 end

diff --git a/apps/workbench/app/views/application/show.html.erb b/apps/workbench/app/views/application/show.html.erb
index 105e1c356d69f140cc7bcc6cbf0a4069a9be2e61..21d6d15dd2cdddcf79599c65edce7e9cd3a34cf5 100644 (file)
--- a/apps/workbench/app/views/application/show.html.erb
+++ b/apps/workbench/app/views/application/show.html.erb
@@ -10,16 +10,16 @@
   <% 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 %>