Fixed error with nil value on custom check_boxes field

fatfreecrm · Dec 13, 2011 · 2d8d71a · 2d8d71a
1 parent 98400cf
commit 2d8d71a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/app/views/fields/_group.html.haml b/app/views/fields/_group.html.haml
@@ -12,7 +12,9 @@
               %td
                 - if field.hint.present?
                   = image_tag "info_tiny.png", :title => field.hint, :class => "tooltip-icon"
-                - checked = YAML.load(f.object.send(field.name)) if field.as == 'check_boxes'
+                - if field.as == 'check_boxes'
+                  - value = f.object.send(field.name)
+                  - checked = YAML.load(value) if value
                 = f.input field.name, field.input_options.merge(:checked => checked)
               - if i == 0
                 %td= spacer
diff --git a/app/views/fields/_sidebar_show.html.haml b/app/views/fields/_sidebar_show.html.haml
@@ -3,6 +3,6 @@
     %div
       .caption #{field_group.label_i18n}
       - field_group.custom_fields.each do |field|
-        - if asset.send(field.name).present?
-          == #{field.label}:<br /> <b>#{truncate(field.render_value(asset), :length => 35)}</b><br />
-  
+        - if (value = field.render_value(asset)).present?
+          == #{field.label}:<br /> <b>#{truncate(value, :length => 35)}</b><br />
+