property.rb in glue-0.29.0

- old
+ new

@@ -162,11 +162,11 @@
   
   def preprocess_value(obj, prop_or_rel, value)
     if prop_or_rel.on_populate && obj.respond_to?(prop_or_rel.on_populate.to_sym)
       return obj.send(prop_or_rel.on_populate.to_sym, value)
     elsif Object.const_defined? :Nitro
-      if control = Nitro::Control.fetch(obj, prop_or_rel, :default => nil) and control.respond_to?(:on_populate)
+      if control = Nitro::Form::Control.fetch(obj, prop_or_rel, :default => nil) and control.respond_to?(:on_populate)
         return control.on_populate(value)
       end
     else
       return value
     end
@@ -179,10 +179,10 @@
       def __force_#{sym}(val)
         if respond_to?(:force_#{sym})
           self.#{sym} = force_#{sym}(val)
         else
           self.#{sym}=(} << case klass.name
-            when Fixnum.name: 'val.nil? ? nil : val.to_i'
+            when Fixnum.name: 'val.to_s.empty? ? nil : val.to_i'
             when String.name: 'val.to_s'
             when Float.name: 'val.to_f'
             when Time.name: 'val.is_a?(Hash) ? Time.local(val["year"],val["month"],val["day"],val["hour"],val["min"]) : Time.parse(val.to_s)'
             when Date.name: 'val.is_a?(Hash) ? Time.local(val["year"],val["month"],val["day"]).to_date : Time.parse(val.to_s).to_date'
             when TrueClass.name, FalseClass.name: 'val == "on" or val == "true" ? true: val.to_i > 0'