show login names and config instructions on VMs page

[arvados.git] / apps / workbench / app / helpers / application_helper.rb

diff --git a/apps/workbench/app/helpers/application_helper.rb b/apps/workbench/app/helpers/application_helper.rb
index fa25a29417eef49c186eccb16ae703321f064e64..d16656602cd9893760eda32e4e1164310922a631 100644 (file)
--- a/apps/workbench/app/helpers/application_helper.rb
+++ b/apps/workbench/app/helpers/application_helper.rb
@@ -2,6 +2,11 @@ module ApplicationHelper
   def current_user
     controller.current_user
   end
+
+  def render_content_from_database(markup)
+    raw RedCloth.new(markup).to_html
+  end
+
   def human_readable_bytes_html(n)
     return h(n) unless n.is_a? Fixnum
     raw = n.to_s
@@ -19,9 +24,6 @@ module ApplicationHelper
       link_name = opts[:link_text]
       if !link_name
         link_name = link_uuid
-        if !opts[:with_prefixes]
-          link_name = link_name.sub /^.{5}-.{5}-/, ''
-        end
         if opts[:with_class_name]
           link_name = "#{resource_class.to_s} #{link_name}"
         end
@@ -33,16 +35,31 @@ module ApplicationHelper
     end
   end
 
-  def render_editable_attribute(object, attr)
-    attrvalue = object.send attr
+  def render_editable_attribute(object, attr, attrvalue=nil, htmloptions={})
+    attrvalue = object.send(attr) if attrvalue.nil?
     return attrvalue if !object.attribute_editable? attr
-    link_to object.send(attr).to_s, '#', {
-      "data-type" => "text",
+
+    input_type = 'text'
+    case object.class.attribute_info[attr.to_sym].andand[:type]
+    when 'text'
+      input_type = 'textarea'
+    when 'datetime'
+      input_type = 'date'
+    else
+      input_type = 'text'
+    end
+
+    attrvalue = attrvalue.to_json if attrvalue.is_a? Hash or attrvalue.is_a? Array
+
+    link_to attrvalue.to_s, '#', {
+      "data-emptytext" => "none",
+      "data-placement" => "bottom",
+      "data-type" => input_type,
       "data-resource" => object.class.to_s.underscore,
       "data-name" => attr,
       "data-url" => url_for(action: "update", id: object.uuid, controller: object.class.to_s.pluralize.underscore),
       "data-original-title" => "Update #{attr.gsub '_', ' '}",
       :class => "editable"
-    }
+    }.merge(htmloptions)
   end
 end