[interchange-cvs] interchange - heins modified 2 files

[interchange-cvs at icdevgroup.org]

User:      heins
Date:      2004-04-23 17:12:02 GMT
Modified:  dist/lib/UI/pages/admin flex_editor.html item_edit.html
Log:
* Fix the long-standing "page [cgi mv_data_table] not found" error on
  return from meta_editor.

Revision  Changes    Path
2.11      +5 -3      interchange/dist/lib/UI/pages/admin/flex_editor.html


rev 2.11, prev_rev 2.10
Index: flex_editor.html
===================================================================
RCS file: /var/cvs/interchange/dist/lib/UI/pages/admin/flex_editor.html,v
retrieving revision 2.10
retrieving revision 2.11
diff -u -r2.10 -r2.11
--- flex_editor.html	22 Feb 2004 19:38:50 -0000	2.10
+++ flex_editor.html	23 Apr 2004 17:12:01 -0000	2.11
@@ -1,8 +1,10 @@
 [strip interpolate=1]
 @_UI_STD_INIT_@
 [calc]
-	$CGI->{mv_data_table} = delete $CGI->{mv_return_table}
-		if $CGI->{mv_return_table};
+	if($CGI->{mv_return_table}) {
+		$CGI->{mv_data_table} = delete $CGI->{mv_return_table};
+		$CGI->{ui_return_to} = 'admin/flex_select';
+	}
 	return;
 [/calc]
 [tmp page_title]
@@ -91,4 +93,4 @@
 
 @_UI_STD_FOOTER_@
 
-<!-- page: @@MV_PAGE@@ version: $Id: flex_editor.html,v 2.10 2004/02/22 19:38:50 mheins Exp $ -->
+<!-- page: @@MV_PAGE@@ version: $Id: flex_editor.html,v 2.11 2004/04/23 17:12:01 mheins Exp $ -->



2.8       +4 -1      interchange/dist/lib/UI/pages/admin/item_edit.html


rev 2.8, prev_rev 2.7
Index: item_edit.html
===================================================================
RCS file: /var/cvs/interchange/dist/lib/UI/pages/admin/item_edit.html,v
retrieving revision 2.7
retrieving revision 2.8
diff -u -r2.7 -r2.8
--- item_edit.html	2 Jul 2003 15:15:31 -0000	2.7
+++ item_edit.html	23 Apr 2004 17:12:02 -0000	2.8
@@ -1,4 +1,7 @@
 [calc]
+	if($CGI->{mv_return_table}) {
+		$CGI->{ui_return_to} = 'admin/item';
+	}
 	$CGI->{mv_data_table} = $Config->{ProductFiles}[0];
 	$CGI->{ui_hide_key} = 1 unless $CGI->{ui_new_item};
 	$CGI->{ui_return_to} ||= '__UI_BASE__/item';
@@ -76,4 +79,4 @@
 [/if-mm]
 
 @_UI_STD_FOOTER_@
-<!-- page: @@MV_PAGE@@ version: $Revision: 2.7 $ -->
+<!-- page: @@MV_PAGE@@ version: $Revision: 2.8 $ -->