lib/spontaneous/field/base.rb in spontaneous-0.2.0.beta5 vs lib/spontaneous/field/base.rb in spontaneous-0.2.0.beta6

@@ -54,16 +54,18 @@
           {}
         end
       end
 
       extend ClassMethods
+      include Spontaneous::Model::Core::ContentHash::FieldMethods
 
       attr_accessor :owner, :name, :unprocessed_value, :template_params, :version
       attr_accessor :prototype
 
 
       def initialize(params={}, default_values=true)
+        @default_values = default_values
         @processed_values = {}
         deserialize(params, default_values)
         @values = nil
       end
 
@@ -329,14 +331,18 @@
 
       def render(format = :html, locals = {}, *args)
         value(format)
       end
 
+      alias_method :render_inline, :render
+
       def render_using(renderer, format = :html, locals = {}, *args)
         render(format, locals)
       end
 
+      alias_method :render_inline_using, :render_using
+
       def to_html(locals = {})
         value(:html)
       end
 
       def to_pdf(*args)
@@ -356,11 +362,11 @@
       def mark_unmodified
         @modified = false
       end
 
       def modified?
-        @modified
+        @modified || false
       end
 
       def schema_id
         self.prototype.schema_id
       end
@@ -435,9 +441,10 @@
           :content_id => owner.id,
           :field_sid => self.schema_id.to_s,
           :version => version,
           :value => @initial_value,
           :user => owner.current_editor)
+        mark_unmodified
       end
 
       def <=>(o)
         unprocessed_value <=> o.unprocessed_value
       end