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

[interchange-cvs at icdevgroup.org]

User:      heins
Date:      2004-12-29 20:10:29 GMT
Modified:  code/UI_Tag auto_wizard.coretag
Log:
* Back out change at 1.14 which broke auto-wizard (removed %overall_opt hash).

* Remove unneeded and unwanted ui_data_fields and extended members from the
  options sent to the table editor.

Revision  Changes    Path
1.16      +5 -5      interchange/code/UI_Tag/auto_wizard.coretag


rev 1.16, prev_rev 1.15
Index: auto_wizard.coretag
===================================================================
RCS file: /var/cvs/interchange/code/UI_Tag/auto_wizard.coretag,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- auto_wizard.coretag	29 Dec 2004 16:25:30 -0000	1.15
+++ auto_wizard.coretag	29 Dec 2004 20:10:29 -0000	1.16
@@ -38,7 +38,7 @@
 /;
 
 my %overall_opt;
-#@overall_opt{@wanted_opts} = @wanted_opts;
+ at overall_opt{@wanted_opts} = @wanted_opts;
 
 sub thanks_title {
 	my ($opt, $already, $default) = @_;
@@ -445,6 +445,7 @@
 			my $met = $Tag->meta_record($k, undef, $t)
 				or last BUILDWIZ;
 			my($structure) = delete $met->{ui_data_fields};
+			delete $met->{extended};
 			%opts = %$met;
 #Debug("display type=$opts{display_type} met=" . ::uneval($met) );
 			$met->{row_template} = $opt->{row_template}
@@ -734,10 +735,6 @@
 		delete $opts{$_};
 	}
 
-	for ( @wanted_opts ) {
-		$opts{$_} ||= $opt->{$_};
-	}
-
 	if($CGI->{ui_wizard_action} eq 'Back') {
 		$current_page = $lastpage - 1;
 	}
@@ -934,6 +931,9 @@
 	}
 
 	delete $opts{type};
+	# Prevent ui_data_fields from parent corrupting wizard
+	delete $opts{ui_data_fields};
+	delete $opts{extended};
 #::logDebug("calling table_editor opts=" . ::uneval(\%opts));
 	$$dest = $Tag->table_editor( {all_opts => \%opts });
 	if($$dest !~ /<form\s+/i) {