[interchange-cvs] interchange - heins modified code/UI_Tag/auto_wizard.coretag

interchange-core@icdevgroup.org interchange-core@icdevgroup.org
Tue Apr 8 21:47:00 2003


User:      heins
Date:      2003-04-09 01:46:12 GMT
Modified:  code/UI_Tag auto_wizard.coretag
Log:
	* Fix extra parameter passing in wizard.

Revision  Changes    Path
1.9       +14 -1     interchange/code/UI_Tag/auto_wizard.coretag


rev 1.9, prev_rev 1.8
Index: auto_wizard.coretag
===================================================================
RCS file: /var/cvs/interchange/code/UI_Tag/auto_wizard.coretag,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- auto_wizard.coretag	14 Jan 2003 02:25:50 -0000	1.8
+++ auto_wizard.coretag	9 Apr 2003 01:46:12 -0000	1.9
@@ -348,6 +348,12 @@
 	}
 
 	$form->{href} = $opt->{output_href} || $ref->{href} || $ref->{page};
+	if($opt->{output_parm}) {
+		my $ref = Vend::Util::scalar_to_hash($opt->{output_parm}) || {};
+		for (keys %$ref) {
+			$form->{$_} = $ref->{$_};
+		}
+	}
 	$form->{form} = 'auto';
 	for(@$fields) {
 		$form->{$_} = $Values->{$_};
@@ -735,6 +741,7 @@
 	my $finished;
 	my $condition_done;
 	my $optref;
+#::logDebug("Getting screens");
 	GETSCREEN: {
 		$optref = $wiz->[$current_page];
 		if(! $condition_done and $optref->{_condition}) {
@@ -836,10 +843,15 @@
 #Debug("we have a wiz=$wizname! current_page = $current_page");
 
 #Debug("optref=" . $Tag->uneval(undef, $optref));
+
+#::logDebug("prepping to walk optref");
+
+### TODO: Find bad reference when no section title...
+
 	my $name = $optref->{_name} || die;
 	$Scratch->{page_title} = $optref->{_page_title};
 
-	if($optref->{_breaks}) {
+	if($optref->{_breaks} and ref($optref->{_breaks}) eq 'ARRAY') {
 		$opts{ui_break_before} = join " ", @{$optref->{_breaks}};
 		$opts{ui_break_before_label} = join ",", @{$optref->{_break_labels}};
 	}
@@ -879,6 +891,7 @@
 	$opts{mv_prevpage} = $Global::Variable->{MV_PAGE} if $current_page != 1;
 	$opts{bottom_buttons} = 1;
 
+#::logDebug("walking optref");
 	my $mod = $optref->{_modifier} || '';
 	for(keys %$optref) {
 		next if /^_/;