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

[interchange-cvs at icdevgroup.org]

User:      ton
Date:      2004-03-14 17:25:28 GMT
Modified:  code/UI_Tag auto_wizard.coretag
Log:
	Enable overall options when template is
	passed to the tag.

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


rev 1.14, prev_rev 1.13
Index: auto_wizard.coretag
===================================================================
RCS file: /var/cvs/interchange/code/UI_Tag/auto_wizard.coretag,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- auto_wizard.coretag	12 Mar 2004 11:06:14 -0000	1.13
+++ auto_wizard.coretag	14 Mar 2004 17:25:28 -0000	1.14
@@ -26,10 +26,19 @@
 	thanks_title
 	top_buttons
 	widget_cell_class
+	email_from
+	email_cc
+	email_subject
+	email_template
+	continue_template
+	row_template
+	output_email
+	output_fields
+	output_repeated
 /;
 
 my %overall_opt;
- at overall_opt{@wanted_opts} = @wanted_opts;
+#@overall_opt{@wanted_opts} = @wanted_opts;
 
 sub thanks_title {
 	my ($opt, $already, $default) = @_;
@@ -723,6 +732,10 @@
 	for(keys %opts) {
 		next unless /^_/;
 		delete $opts{$_};
+	}
+
+	for ( @wanted_opts ) {
+		$opts{$_} ||= $opt->{$_};
 	}
 
 	if($CGI->{ui_wizard_action} eq 'Back') {