Index: openacs-4/packages/acs-templating/tcl/form-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/form-procs.tcl,v diff -u -r1.25.2.2 -r1.25.2.3 --- openacs-4/packages/acs-templating/tcl/form-procs.tcl 25 Nov 2003 13:07:36 -0000 1.25.2.2 +++ openacs-4/packages/acs-templating/tcl/form-procs.tcl 11 Feb 2004 10:20:42 -0000 1.25.2.3 @@ -405,9 +405,29 @@ } { get_reference - # + #---------------------------------------------------------------------- + # Check for errors on form + #---------------------------------------------------------------------- + + # make a reference to the formerror array with any validation messages + upvar #$level $id:error $id:error + + # Clear the formerror array if it has + # been set by another form on the same page + upvar #$level formerror formerror + if { [info exists formerror] } { unset formerror } + + if { [info exists $id:error] } { + + uplevel #$level "upvar 0 $id:error formerror" + + # There were errors on the form, force edit mode + set properties(mode) edit + } + + #---------------------------------------------------------------------- # Buttons - # + #---------------------------------------------------------------------- if { [exists_and_not_null form_properties(cancel_url)] && ![exists_and_not_null form_properties(cancel_label)] } { set form_properties(cancel_label) "Cancel" @@ -446,22 +466,6 @@ template::element create $id $name -widget submit -label $label -datatype text } - # make a reference to the formerror array with any validation messages - upvar #$level $id:error $id:error - - # Clear the formerror array if it has - # been set by another form on the same page - upvar #$level formerror formerror - if { [info exists formerror] } { unset formerror } - - if { [info exists $id:error] } { - - uplevel #$level "upvar 0 $id:error formerror" - - # There were errors on the form, force edit mode - set properties(mode) edit - } - # Propagate form mode to all form elements foreach element_ref $elements {