[ARVADOS] updated: ceb2ed3a4f6c68a1c95d92271ba77b5e3d8b6a58

git at public.curoverse.com git at public.curoverse.com
Sun Dec 14 08:33:59 EST 2014


Summary of changes:
 apps/workbench/app/helpers/application_helper.rb | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

       via  ceb2ed3a4f6c68a1c95d92271ba77b5e3d8b6a58 (commit)
      from  db8213fdb447e701467787f631beba495d0c7fbb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit ceb2ed3a4f6c68a1c95d92271ba77b5e3d8b6a58
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Sun Dec 14 08:27:44 2014 -0500

    4523: cleaner update of render_editable_attribute method to use textarea for descriptions.

diff --git a/apps/workbench/app/helpers/application_helper.rb b/apps/workbench/app/helpers/application_helper.rb
index 5e6d574..11c55c3 100644
--- a/apps/workbench/app/helpers/application_helper.rb
+++ b/apps/workbench/app/helpers/application_helper.rb
@@ -160,10 +160,10 @@ module ApplicationHelper
     end
 
     input_type = 'text'
-    case object.class.attribute_info[attr.to_sym].andand[:type]
-    when 'text'
+    attrtype = object.class.attribute_info[attr.to_sym].andand[:type]
+    if attrtype == 'text' or attr == 'description'
       input_type = 'textarea'
-    when 'datetime'
+    elsif attrtype == 'datetime'
       input_type = 'date'
     else
       input_type = 'text'
@@ -188,9 +188,6 @@ module ApplicationHelper
     @unique_id ||= (Time.now.to_f*1000000).to_i
     span_id = object.uuid.to_s + '-' + attr.to_s + '-' + (@unique_id += 1).to_s
 
-    if attr == 'description'
-      input_type = 'textarea'
-    end
     span_tag = content_tag 'span', rendervalue, {
       "data-emptytext" => '(none)',
       "data-placement" => "bottom",

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list