Index: openacs-4/packages/xowiki/tcl/includelet-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/includelet-procs.tcl,v diff -u -r1.64 -r1.65 --- openacs-4/packages/xowiki/tcl/includelet-procs.tcl 10 Oct 2008 07:39:35 -0000 1.64 +++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl 10 Oct 2008 16:53:47 -0000 1.65 @@ -2793,15 +2793,23 @@ set fn [::xowiki::PageInstance get_short_spec_from_form_constraints \ -name @table \ -form_constraints $form_constraints] - set field_names [split $fn ,] + set raw_field_names [split $fn ,] } elseif {[string match "*,*" $field_names] } { - set field_names [split $field_names ,] + set raw_field_names [split $field_names ,] } - if {$field_names eq ""} { - set field_names {_name _last_modified _creation_user} + if {$raw_field_names eq ""} { + set raw_field_names {_name _last_modified _creation_user} } + # finally, evaluate conditions if included + set field_names [list] + foreach f $raw_field_names { + set _ [string trim [::xowiki::formfield::FormField get_single_spec \ + -package_id $package_id $f]] + if {$_ ne ""} {lappend field_names $_} + } + set form_fields [::xowiki::FormPage get_table_form_fields \ -base_item $form_item \ -field_names $field_names \