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.430 -r1.431 --- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 15 May 2011 11:21:00 -0000 1.430 +++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 16 May 2011 12:27:53 -0000 1.431 @@ -1708,7 +1708,7 @@ } Page instproc render_content {} { - #my msg "-- '[my set text]'" + #my log "-- '[my set text]'" set html ""; set mime "" foreach {html mime} [my set text] break if {[my render_adp]} { @@ -2463,6 +2463,11 @@ # next #} + FormPage instproc get_anon_instances {} { + # maybe overloaded from WorkFlow + my get_from_template anon_instances f + } + FormPage instproc get_form_constraints {{-trylocal false}} { # We define it as a method to ease overloading. #my msg "is_form=[my is_form]" @@ -2513,15 +2518,15 @@ # which might not contain it, if e.g. the first form is a plain # wiki page. # - #my msg "resolve property $var=>[my exists_property $var]" + #my msg "resolve local property $var=>[my exists_property $var]" if {[my istype ::xowiki::FormPage] && [my exists_property $var]} { #my msg "returning local property [my property $var]" return [my property $var] } # # if everything fails, return the default. # - #my msg "returning the default, parent is of type [$form_obj info class]" + #my msg "returning the default <$default>, parent is of type [$form_obj info class]" return $default } 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.290 -r1.291 --- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 31 Jan 2011 22:09:32 -0000 1.290 +++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 16 May 2011 12:27:53 -0000 1.291 @@ -603,9 +603,9 @@ #my log "edit [self args]" set form [my get_form] - set anon_instances [my get_from_template anon_instances f] - #my msg form=$form - #my msg anon_instances=$anon_instances + set anon_instances [my get_anon_instances] + #my log form=$form + #my log anon_instances=$anon_instances set field_names [my field_names -form $form] #my log field_names=$field_names @@ -621,6 +621,7 @@ } else { set formgiven 1 } + #my log formgiven=$formgiven # check name field: # - if it is for anon instances, hide it, @@ -654,7 +655,7 @@ } #my show_fields $form_fields - #my msg "__form_action [my form_parameter __form_action {}]" + #my log "__form_action [my form_parameter __form_action {}]" if {[my form_parameter __form_action ""] eq "save-form-data"} { #my msg "we have to validate" # @@ -718,7 +719,7 @@ } } } elseif {[my form_parameter __form_action ""] eq "view-form-data" && ![my exists __feedback_mode]} { - # We have nothing to save (maybe everything is read.only). Check + # We have nothing to save (maybe everything is read-only). Check # __feedback_mode to prevent recursive loops. set redirect_method [my form_parameter __form_redirect_method "view"] #my log "__redirect_method=$redirect_method" @@ -747,13 +748,12 @@ # For named entries, just set the entry fields to empty, # without changing the instance variables - #my msg "my is_new_entry [my name] = [my is_new_entry [my name]]" + #my log "my is_new_entry [my name] = [my is_new_entry [my name]]" if {[my is_new_entry [my name]]} { - #my msg "anon_instances=$anon_instances" if {$anon_instances} { set basename [::xowiki::autoname basename [$page_template name]] set name [::xowiki::autoname new -name $basename -parent_id [my parent_id]] - #my msg "generated name=$name, page_template-name=[$page_template name]" + #my log "generated name=$name, page_template-name=[$page_template name]" $ff(_name) value $name } else { $ff(_name) value [$ff(_name) default] @@ -794,7 +794,7 @@ # Due to this bug, we program around and replace the at-character # by \x003 to avoid conflict withe the input and we replace these # magic chars finally with the fields resulting from tdom. - + set form [my substitute_markup $form] set form [string map [list @ \x003] $form] #my msg form=$form