lib/efo_nelfo/property.rb in efo_nelfo-1.3.0 vs lib/efo_nelfo/property.rb in efo_nelfo-1.3.1
- old
+ new
@@ -48,11 +48,11 @@
when boolean?
new_value.nil? || new_value == true || new_value == 'J' || new_value == 'j' || new_value == '' ? true : false
when date?
new_value.is_a?(Date) ? new_value : Date.parse(new_value) rescue nil
when integer?
- new_value.nil? ? nil : new_value.to_i
+ new_value.nil? && !required? ? nil : new_value.to_i
else
new_value
end
end
@@ -71,16 +71,16 @@
end
alias :to_decimal :to_f
# Returns true if the property is read only
def readonly?
- options[:read_only]
+ options[:read_only] == true
end
# Returns true if the property is required
# Note: this is not in use yet
def required?
- options[:required]
+ options[:required] == true
end
def boolean?; type == :boolean; end
def date?; type == :date; end
def integer?; type == :integer; end