Added 'column("name")' for VirtualClasses, fixed default input field …

…rendering for column.

app/models/role.rb

@@ -22,6 +22,7 @@ class Role < ActiveRecord::Base
   include RubyLess
   # Columns defined in the role.
   safe_method :columns     => {:class => ['Column'], :method => 'defined_safe_columns'}
+  safe_method [:column, String] => {:class => 'Column', :nil => true, :method => 'defined_safe_column'}
 
   safe_method :name => String
 
@@ -191,6 +192,21 @@ def defined_safe_columns
     @safe_column ||= defined_columns.values.sort {|a,b| a.name <=> b.name}
   end
 
+  # By default, all defined columns are safe (see )
+  def defined_safe_column(name)
+    if real_class?
+      # Get columns from the 'native' schema of the real class (this schema is a Property::Role,
+      # not a VirtualClass or ::Role).
+      #
+      # Only columns explicitly declared safe are safe here
+      if real_class.safe_method_type(name)
+        real_class.schema.defined_columns[name]
+      end
+    else
+      defined_columns[name]
+    end
+  end
+
   def export
     res = Zafu::OrderedHash.new
     res['type'] = real_class? ? 'Class' : type

lib/zena/use/forms.rb

@@ -521,6 +521,7 @@ def r_input(skip_col = false)
             @markup.set_param(:type, @params[:type])
             @markup.set_param(:text, @params[:text]) if @params[:text]
             @markup.set_params(html_attributes)
+            @markup.done = false
             wrap('')
           else
             # 'text', 'hidden', ...
@@ -531,6 +532,7 @@ def r_input(skip_col = false)
             checked = html_attributes.delete(:checked)
             @markup.set_dyn_params(html_attributes)
             @markup.append_attribute checked if checked
+            @markup.done = false
             wrap('')
           end
 

test/integration/zafu_compiler/forms.yml

@@ -268,4 +268,15 @@ hidden_fields_in_form_tag:
 
 hidden_fields_in_form_tag_dynamic:
   src: "<r:form  node[log]='title'></r:form>"
-  tem: "/<input type='hidden' name='node\[log\]' value='<%= @node.prop\['title'\] %>/"
+  tem: "/<input type='hidden' name='node\[log\]' value='<%= @node.prop\['title'\] %>/"
+
+should_show_column:
+  src: "<r:Document do='column(\"size\")' do='name'/>"
+  res: "size"
+
+should_show_fields_for_columns:
+  context:
+    node: 'forest_pdf'
+  src: "<r:form><r:Document do='column(\"size\")' do='input'/></r:form>"
+  tem: "/input type='text' name='node\\[<%= var2.name %>\\]/"
+  res: "/<input type='text' name='node\\[size\\]' value='63569'/>/"