From: khoff <khoff>
Date: Mon, 21 Apr 2003 21:29:35 +0000 (+0000)
Subject: Navigation fixes.
X-Git-Tag: freeside_1_5_0pre1~11
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=fcfad3cd469df0df1beb2d54ea990a387915ebe2

Navigation fixes.
---

diff --git a/httemplate/edit/part_router_field.cgi b/httemplate/edit/part_router_field.cgi
index c3e99be2c..02962b1c0 100644
--- a/httemplate/edit/part_router_field.cgi
+++ b/httemplate/edit/part_router_field.cgi
@@ -21,7 +21,10 @@ if ( $cgi->param('error') ) {
 my $action = $part_router_field->routerfieldpart ? 'Edit' : 'Add';
 
 my $p1 = popurl(1);
-print header("$action Router Extended Field Definition", '');
+print header("$action Router Extended Field Definition",
+             menubar('Main Menu' => $p,
+                     'View all Extended Fields' => $p. 'browse/generic.cgi?part_router_field')
+            );
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT>"
@@ -30,8 +33,6 @@ print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
 <FORM ACTION="<%=$p1%>process/generic.cgi" METHOD=POST>
 
 <INPUT TYPE="hidden" NAME="table" VALUE="part_router_field">
-<INPUT TYPE="hidden" NAME="redirect_ok" 
-    VALUE="<%=$p1%>part_router_field.cgi">
 <INPUT TYPE="hidden" NAME="routerfieldpart" VALUE="<%=
   $routerfieldpart%>">
 Field #<B><%=$routerfieldpart or "(NEW)"%></B><BR><BR>
diff --git a/httemplate/edit/process/generic.cgi b/httemplate/edit/process/generic.cgi
index 751987f7a..9c54feb1d 100644
--- a/httemplate/edit/process/generic.cgi
+++ b/httemplate/edit/process/generic.cgi
@@ -27,6 +27,7 @@ use DBIx::DBSchema::Table;
 
 my $error;
 my $p2 = popurl(2);
+my $p3 = popurl(3);
 my $table = $cgi->param('table');
 my $dbdef = dbdef or die "Cannot fetch dbdef!";
 
@@ -56,7 +57,7 @@ if($pkey_val and (my $old = qsearchs($table, { $pkey, $pkey_val} ))) {
 }
 
 my $redirect_ok = (($cgi->param('redirect_ok')) ?
-                    $cgi->param('redirect_ok') : $p2."view/$table.cgi");
+                    $cgi->param('redirect_ok') : $p3."browse/generic.cgi?$table");
 my $redirect_error = (($cgi->param('redirect_error')) ?
                        $cgi->param('redirect_error') : $cgi->referer());
 
@@ -64,6 +65,6 @@ if($error) {
   $cgi->param('error', $error);
   print $cgi->redirect($redirect_error . '?' . $cgi->query_string);
 } else {
-  print $cgi->redirect($redirect_ok . '?' .$pkey_val);
+  print $cgi->redirect($redirect_ok);
 }
 %>