more x-editable

diff --git a/apps/workbench/app/helpers/application_helper.rb b/apps/workbench/app/helpers/application_helper.rb
index c6d4d64a8ba4b8ac87ed773e06482cda1d83ac8a..916e4b20db5f53549c950236426255471d943ccc 100644 (file)
--- a/apps/workbench/app/helpers/application_helper.rb
+++ b/apps/workbench/app/helpers/application_helper.rb
@@ -36,10 +36,21 @@ module ApplicationHelper
   def render_editable_attribute(object, attr, attrvalue=nil, htmloptions={})
     attrvalue = object.send(attr) if attrvalue.nil?
     return attrvalue if !object.attribute_editable? attr
+
+    input_type = 'text'
+    case object.class.attribute_info[attr.to_sym][:type]
+    when 'text'
+      input_type = 'textarea'
+    when 'datetime'
+      input_type = 'date'
+    else
+      input_type = 'text'
+    end
+
     link_to attrvalue.to_s, '#', {
       "data-emptytext" => "none",
       "data-placement" => "bottom",
-      "data-type" => (object.class.attribute_info[attr.to_sym][:type] == "text" ? "textarea" : "text"),
+      "data-type" => input_type,
       "data-resource" => object.class.to_s.underscore,
       "data-name" => attr,
       "data-value" => object.send(attr),

diff --git a/apps/workbench/app/views/authorized_keys/index.html.erb b/apps/workbench/app/views/authorized_keys/index.html.erb
index 823a17eb96cb129697c9dd3cbe8a2ce18b99cd2d..bdfc2f7eb67a3f4cbade68cd71d2ce0c1539231e 100644 (file)
--- a/apps/workbench/app/views/authorized_keys/index.html.erb
+++ b/apps/workbench/app/views/authorized_keys/index.html.erb
@@ -29,8 +29,8 @@
         <%= render_editable_attribute ak, 'name' %>
       </td><td>
         <%= render_editable_attribute ak, 'key_type', ak.key_type, "data-type" => "select", "data-source" => '[{value:"SSH",text:"SSH"}]' %>
-      </td><td>
-        <%= render_editable_attribute ak, 'public_key', ak.public_key.andand.sub(/^(.{12}).{16,}(.{16,})$/, '\1...\2') %>
+      </td><td style="max-width: 120px; overflow-x: hidden">
+        <%= render_editable_attribute ak, 'public_key' %>
       </td><td>
         <%= render_editable_attribute ak, 'expires_at' %>
       </td><td>