t#:

[pettanr/pettanr.git] / lib / manifest / form.rb

diff --git a/lib/manifest/form.rb b/lib/manifest/form.rb
index 787e458..4dde25d 100644 (file)
--- a/lib/manifest/form.rb
+++ b/lib/manifest/form.rb
@@ -11,7 +11,7 @@ module Pettanr
           
           def tag_options
             opt = @field.tag_options.merge(@conf['options'] || {})
-            @field.element.field_tag_attributes(@field.column, @field.mounted, opt)
+            @field.element.field_tag_attributes(@field.column, @field.tag_mounted, opt)
           end
           
           def render view
@@ -54,7 +54,7 @@ module Pettanr
           
           def render view
             view.select_tag @field.tag_name, 
-              view.options_for_select(view.t_select_items(self.items), @field.tag_value), self.tag_options
+              view.options_for_select(view.t_select_items(self.items), :selected => @field.tag_value.to_s ), self.tag_options
           end
           
         end
@@ -150,6 +150,10 @@ module Pettanr
           self.element.attributes[self.column]
         end
         
+        def tag_mounted
+          self.mounted ? 0 : 1
+        end
+        
         def field
           @field ||= @@type[@field_conf['type']].new @field_conf, self
         end
@@ -167,14 +171,15 @@ module Pettanr
       attr :element, :mounted, :attributes, :fields, :model_name
       def initialize element, operators, mounted, manifest
         @element = element
-        @manifest = manifest
+        @operators = operators
         @mounted = mounted
+        @manifest = manifest
         
         @base = @manifest.base
         @model_name = @base || element.model_name
         
         base_field_confs = if @base
-          base_form = Pettanr::Application::manifest.form_managers[@base]
+          base_form = Pettanr::Application::manifest.form(@base)
           base_form.fields
         else
           {}