[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.298,1.299

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv32103a/bin

Modified Files:
	sandweb.cgi 
Log Message:
I passed the HTTP_REFERRER through the main branch and tag menus as "main_window_url", and then they give it to their commit subs as "previous_url" so the main window gets refreshed after tagging operations.


Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.298
retrieving revision 1.299
diff -U2 -r1.298 -r1.299
--- sandweb.cgi	7 Jun 2002 07:28:43 -0000	1.298
+++ sandweb.cgi	13 Jun 2002 21:12:36 -0000	1.299
@@ -151,4 +151,5 @@
 		my $sort = $cgi->param('sort') || '';
 		my $previous_url = $cgi->param('previous_url') || '';
+		my $main_window_url = $cgi->param('main_window_url') || '';
 
 		$log->debug("action: $action submit: $submit");
@@ -240,4 +241,5 @@
 						tag_commit(
 							ck_auth => $ck_auth,
+							main_window_url => $main_window_url,
 							tag_sync => $tag_sync,
 							tag_switch => $tag_switch,
@@ -266,13 +268,14 @@
 
 				if ( $vcs_command eq "branch" ) {
-					my $branch_sync = CGI::param('branch_sync') || '';
-					my $branch_switch = CGI::param('branch_switch') || '';
-					my $trunk_sync = CGI::param('trunk_sync') || '';
-					my $trunk_switch = CGI::param('trunk_switch') || '';
-					my $create_branch = CGI::param('create_branch') || '';
-					my $remove_branch = CGI::param('remove_branch') || '';
+					my $branch_sync = $cgi->param('branch_sync') || '';
+					my $branch_switch = $cgi->param('branch_switch') || '';
+					my $trunk_sync = $cgi->param('trunk_sync') || '';
+					my $trunk_switch = $cgi->param('trunk_switch') || '';
+					my $create_branch = $cgi->param('create_branch') || '';
+					my $remove_branch = $cgi->param('remove_branch') || '';
 					if ($submit) {
 						branch_commit(
 							ck_auth => $ck_auth,
+							main_window_url => $main_window_url,
 							branch_sync => $branch_sync,
 							branch_switch => $branch_switch,
@@ -1493,4 +1496,6 @@
 	my $repo_name = $args{'repo_name'};
 
+	my $main_window_url = "$ENV{'HTTP_REFERER'}";
+
 	my @filename = ();
 	my $count = 0;
@@ -1507,4 +1512,5 @@
 		MODULE_NAME => $module_name,
 		REPO_NAME => $repo_name,
+		MAIN_WINDOW_URL => $main_window_url,
 	);
 	print $cgi->header( -cookie => $ck_auth );
@@ -1539,4 +1545,6 @@
 	my $repo_name = $args{'repo_name'};
 
+	my $main_menu_url = "$ENV{'HTTP_REFERER'}";
+
 	my @filename = ();
 	my $count = 0;
@@ -1553,6 +1561,7 @@
 		MODULE_NAME => $module_name,
 		REPO_NAME => $repo_name,
+		MAIN_WINDOW_URL => $main_menu_url,
 	);
-	print CGI::header( -cookie => $ck_auth );
+	print $cgi->header( -cookie => $ck_auth );
 	$ui->print_popup(
 		TITLE=> 'SandWeb : branch menu',
@@ -2530,4 +2539,6 @@
 		configuration_menu( ck_auth => $ck_auth );
 	}
+
+	my $main_window_url = $args{'main_window_url'};
 	
 	my @filename = ();
@@ -2674,4 +2685,5 @@
 		MENU_TITLE => 'SandWeb',
 		SUBMENU_TITLE => "VCS tag",
+		PREVIOUS_URL => $main_window_url,
 		FOOTER => '',
 		CONTENT => $content,
@@ -2709,4 +2721,6 @@
 	}
 	
+	my $main_window_url = $args{'main_window_url'};
+
 	my @filename = ();
 	my $count = 0;
@@ -2717,5 +2731,5 @@
 	my $module_name = $args{'module_name'};
 	my $location = $args{'location'};
-	my $message = CGI::param('message');
+	my $message = $cgi->param('message');
 	my $username = $auth->get_username();
 	my $users_dir = $config->{'paths'}->{'users_dir'};
@@ -2849,9 +2863,10 @@
 	);
 
-	print CGI::header( -cookie => $ck_auth );
+	print $cgi->header( -cookie => $ck_auth );
 	$ui->print_popup(
 		TITLE=> "SandWeb : VCS branch",
 		MENU_TITLE => 'SandWeb',
 		SUBMENU_TITLE => "VCS branch",
+		PREVIOUS_URL => $main_window_url,
 		FOOTER => '',
 		CONTENT => $content,