Index: openacs-4/packages/xowiki/tcl/form-field-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/form-field-procs.tcl,v diff -u -r1.93 -r1.94 --- openacs-4/packages/xowiki/tcl/form-field-procs.tcl 13 Sep 2008 19:08:26 -0000 1.93 +++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl 16 Sep 2008 11:54:59 -0000 1.94 @@ -1037,7 +1037,7 @@ next } - abstract_page instproc pretty_value {} { + abstract_page instproc pretty_value {v} { my instvar package_prefix package_id if {[my multiple]} { @@ -1079,7 +1079,7 @@ } form_page instproc compute_options {} { my instvar form_obj package_prefix where - + #my msg "[my name] compute_options [my exists form]" if {![my exists form]} { return } @@ -1112,7 +1112,7 @@ if {![my exists form_obj]} { error "No form specified for form_field [my name]" } - my set package_id [$form_obj package_id] + my set package_id [[my set form_obj] package_id] next } Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v diff -u -r1.278 -r1.279 --- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 12 Sep 2008 19:19:56 -0000 1.278 +++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 16 Sep 2008 11:54:59 -0000 1.279 @@ -2076,7 +2076,10 @@ $doc documentElement root set form_node [lindex [$root selectNodes //form] 0] Form add_dom_attribute_value $form_node class "margin-form" - #my set_form_data $form_fields + # The following two commands are for non-generated form contents + my set_form_data $form_fields + Form dom_disable_input_fields $root + # Return finally the result return [$root asHTML] } } Index: openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl,v diff -u -r1.168 -r1.169 --- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 12 Sep 2008 17:28:42 -0000 1.168 +++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 16 Sep 2008 11:54:59 -0000 1.169 @@ -584,10 +584,10 @@ set type [expr {[$field hasAttribute type] ? [$field getAttribute type] : "text"}] switch $type { checkbox { - my msg "get_form_value not implemented for $type" + #my msg "get_form_value not implemented for $type" } radio { - my msg "get_form_value not implemented for $type" + #my msg "get_form_value not implemented for $type" } hidden - password - @@ -596,7 +596,9 @@ return [$field getAttribute value] } } - default {my msg "can't handle $type so far $att=$value"} + default { + #my msg "can't handle $type so far $att=$value" + } } } return "" @@ -1527,7 +1529,8 @@ return [list] } - Page instproc create-new {} { + Page instproc create-new {{-view_method edit}} { +my msg "Page create-new, my mixins=[my info mixin], view_method=$view_method" my instvar package_id set instance_attributes [my default_instance_attributes] set original_package_id $package_id @@ -1547,7 +1550,7 @@ "Page '[my name]' invalid provided package instance=$package_instance
$errorMsg
"] } my parent_id [$package_id folder_id] - } + } set f [FormPage new -destroy_on_cleanup \ -package_id $package_id \ -parent_id [my parent_id] \ @@ -1595,7 +1598,7 @@ $package_id returnredirect \ [export_vars -base [$package_id pretty_link [$f name]] \ - {{m edit} return_url name template_file title detail_link text}] + [list [list m $view_method] return_url name template_file title detail_link text]] }