From: Rob H. <for...@us...> - 2003-06-01 07:58:28
|
Update of /cvsroot/sandweb/sandweb/bin In directory sc8-pr-cvs1:/tmp/cvs-serv4034/bin Modified Files: Tag: release-1_0-branch sandweb.cgi Log Message: copying submenu work (for tag bug) over from trunk Index: sandweb.cgi =================================================================== RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v retrieving revision 1.348.2.1 retrieving revision 1.348.2.2 diff -U2 -r1.348.2.1 -r1.348.2.2 --- sandweb.cgi 22 Apr 2003 17:55:40 -0000 1.348.2.1 +++ sandweb.cgi 1 Jun 2003 07:58:24 -0000 1.348.2.2 @@ -239,5 +239,6 @@ # whether or not this is a submenu my $submenu = $cgi->param('submenu') || ''; - + + $log->debug("submenu: $submenu\n"); $log->debug("action: $action - submit: $submit"); $log->debug("module_description: $module_description\n"); @@ -289,4 +290,5 @@ module_name => $module_name, module_description => $module_description, + submenu => $submenu, submit => $submit, ); @@ -339,4 +341,5 @@ filename => \@filename, location => $location, + submenu => $submenu, ); exit; @@ -406,4 +409,5 @@ repo_name => $repo_name, repo_password => $repo_password, + submenu => $submenu, filename => \@filename, location => $location, @@ -872,4 +876,5 @@ 'bindir' => $bindir, 'log_obj' => $log, + 'sandbox' => "$users_dir/$username/$repo_name/$module_name", ); @@ -951,5 +956,6 @@ LOCATION_LOOP => \@loop_data, ); - + + $log->debug("current_location: ".$location); my %browser = $browse->get_browser( 'location' => $location, @@ -1887,14 +1893,15 @@ my %args = @_; - my $ck_auth = $args{'ck_auth'} || ''; - my $location = $args{'location'} || ''; - my $module_name = $args{'module_name'} || ''; - my $repo_name = $args{'repo_name'} || ''; - my $repo_password = $args{'repo_password'} || ''; - my $vcs_command = $args{'vcs_command'} || ''; - my $vcs_message = $args{'message'} || ''; - my $params = $args{'params'} || ''; + my $ck_auth = $args{'ck_auth'}; + my $location = $args{'location'}; + my $module_name = $args{'module_name'}; + my $repo_name = $args{'repo_name'}; + my $repo_password = $args{'repo_password'}; + my $vcs_command = $args{'vcs_command'}; + my $vcs_message = $args{'message'}; + my $params = $args{'params'}; my $main_window_url = $args{'main_window_url'} || ''; my $submenu = $args{'submenu'} || ''; + $log->debug("submenu in vcs_menu : $submenu"); my @filename_loop = (); my $count = 0; @@ -1930,4 +1937,5 @@ FILENAME => '', PROGNAME => $progname, + SUBMENU => $submenu, OUTPUT => "Please select file(s) or folder(s) to perform vcs action on", ERROR => "No file(s) or folder(s) selected", @@ -2564,4 +2572,5 @@ my $main_window_url = $args{'main_window_url'}; my $params = $args{'params'} || ''; + my $submenu = $args{'submenu'} || ''; my %return; @@ -2609,4 +2618,5 @@ FILENAME => @filename, PROGNAME => $progname, + SUBMENU => $submenu, VCS_OUTPUT => join('', @vcs_output), VCS_ERROR => join('', @vcs_error), @@ -2665,4 +2675,5 @@ FILENAME => @filename, PROGNAME => $progname, + SUBMENU => $submenu, VCS_OUTPUT => join('', @vcs_output), VCS_ERROR => join('', @vcs_error), @@ -2688,4 +2699,5 @@ MODULE_NAME => $module_name, REPO_NAME => $repo_name, + SUBMENU => $submenu, FILENAME => "@filename", IMAGE_DIR => $image_dir, @@ -2722,4 +2734,5 @@ FILENAME => @filename, PROGNAME => $progname, + SUBMENU => $submenu, VCS_OUTPUT => join('', @vcs_output), VCS_ERROR => join('', @vcs_error), @@ -2746,4 +2759,5 @@ FILENAME => @filename, PROGNAME => $progname, + SUBMENU => $submenu, VCS_OUTPUT => join('', @vcs_output), VCS_ERROR => join('', @vcs_error), @@ -2798,4 +2812,5 @@ FILENAME => "@filename", PROGNAME => $progname, + SUBMENU => $submenu, VCS_OUTPUT => join('', @vcs_output), VCS_ERROR => join('', @vcs_error), @@ -2838,4 +2853,5 @@ my $module_description = $args{'module_description'}; my $submit = $args{'submit'}; + my $submenu = $args{'submenu'} || ''; my $repo_server = $user->get_repo_server(repo => $repo_name); @@ -2911,4 +2927,5 @@ repo_name => $repo_name, repo_password => $repo_password, + submenu => $submenu, filename => \@filename, location => '', @@ -3168,4 +3185,5 @@ my $users_dir = $config->{'paths'}->{'users_dir'}; my $repo_name = $args{'repo_name'}; + my $submenu = $args{'submenu'} || ''; my $prev_url = "$ENV{'HTTP_REFERER'}"; $log->debug("prev_url $prev_url"); @@ -3215,4 +3233,5 @@ repo_name => $repo_name, repo_password => $repo_password, + submenu => $submenu, filename => \@filename, location => $location, @@ -3233,4 +3252,5 @@ module_name => $module_name, repo_name => $repo_name, + submenu => $submenu, repo_password => $repo_password, filename => \@filename, @@ -3251,4 +3271,5 @@ module_name => $module_name, repo_name => $repo_name, + submenu => $submenu, repo_password => $repo_password, filename => \@filename, @@ -3271,4 +3292,5 @@ repo_name => $repo_name, repo_password => $repo_password, + submenu => $submenu, filename => \@filename, location => $location, @@ -3284,4 +3306,5 @@ ); + $log->debug("submenu passed from create_tag: $submenu"); vcs_menu( ck_auth => $ck_auth, @@ -3290,4 +3313,5 @@ repo_name => $repo_name, repo_password => $repo_password, + submenu => $submenu, filename => \@filename, location => $location, @@ -3309,4 +3333,5 @@ repo_name => $repo_name, repo_password => $repo_password, + submenu => $submenu, filename => \@filename, location => $location, @@ -3386,4 +3411,5 @@ my $repo_name = $args{'repo_name'}; my $prev_url = "$ENV{'HTTP_REFERER'}"; + my $submenu = $args{'submenu'} || ''; $log->debug("prev_url $prev_url"); my %return; @@ -3432,4 +3458,5 @@ repo_name => $repo_name, repo_password => $repo_password, + submenu => $submenu, filename => \@filename, location => $location, @@ -3451,4 +3478,5 @@ repo_password => $repo_password, filename => \@filename, + submenu => $submenu, location => $location, params => \%params, @@ -3467,4 +3495,5 @@ repo_name => $repo_name, repo_password => $repo_password, + submenu => $submenu, filename => \@filename, location => $location, @@ -3485,4 +3514,5 @@ repo_name => $repo_name, repo_password => $repo_password, + submenu => $submenu, filename => \@filename, location => $location, @@ -3504,4 +3534,5 @@ repo_name => $repo_name, repo_password => $repo_password, + submenu => $submenu, filename => \@filename, location => $location, @@ -3522,4 +3553,5 @@ repo_name => $repo_name, repo_password => $repo_password, + submenu => $submenu, filename => \@filename, location => $location, |