From: Rob H. <for...@us...> - 2003-06-01 07:44:45
|
Update of /cvsroot/sandweb/sandweb/bin In directory sc8-pr-cvs1:/tmp/cvs-serv27382/bin Modified Files: sandweb.cgi Log Message: more work on the whole tag w/out saved passwords bug :P still not working right but this is a step in the right direction. we *Really* need to make the menu stuff more generic, it's a huge pain in the ass right now. I'll tackle this after 1.0; for now I just want what we have to work :) (it's not that bad, just tedious to work with. too much copy/pasting to add or extend menus). Index: sandweb.cgi =================================================================== RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v retrieving revision 1.351 retrieving revision 1.352 diff -U2 -r1.351 -r1.352 --- sandweb.cgi 23 Apr 2003 22:45:47 -0000 1.351 +++ sandweb.cgi 1 Jun 2003 07:16:13 -0000 1.352 @@ -242,5 +242,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"); @@ -292,4 +293,5 @@ module_name => $module_name, module_description => $module_description, + submenu => $submenu, submit => $submit, ); @@ -342,4 +344,5 @@ filename => \@filename, location => $location, + submenu => $submenu, ); exit; @@ -409,4 +412,5 @@ repo_name => $repo_name, repo_password => $repo_password, + submenu => $submenu, filename => \@filename, location => $location, @@ -1907,4 +1911,5 @@ 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; @@ -1940,4 +1945,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", @@ -2574,4 +2580,5 @@ my $main_window_url = $args{'main_window_url'}; my $params = $args{'params'} || ''; + my $submenu = $args{'submenu'} || ''; my %return; @@ -2619,4 +2626,5 @@ FILENAME => @filename, PROGNAME => $progname, + SUBMENU => $submenu, VCS_OUTPUT => join('', @vcs_output), VCS_ERROR => join('', @vcs_error), @@ -2675,4 +2683,5 @@ FILENAME => @filename, PROGNAME => $progname, + SUBMENU => $submenu, VCS_OUTPUT => join('', @vcs_output), VCS_ERROR => join('', @vcs_error), @@ -2698,4 +2707,5 @@ MODULE_NAME => $module_name, REPO_NAME => $repo_name, + SUBMENU => $submenu, FILENAME => "@filename", IMAGE_DIR => $image_dir, @@ -2732,4 +2742,5 @@ FILENAME => @filename, PROGNAME => $progname, + SUBMENU => $submenu, VCS_OUTPUT => join('', @vcs_output), VCS_ERROR => join('', @vcs_error), @@ -2756,4 +2767,5 @@ FILENAME => @filename, PROGNAME => $progname, + SUBMENU => $submenu, VCS_OUTPUT => join('', @vcs_output), VCS_ERROR => join('', @vcs_error), @@ -2808,4 +2820,5 @@ FILENAME => "@filename", PROGNAME => $progname, + SUBMENU => $submenu, VCS_OUTPUT => join('', @vcs_output), VCS_ERROR => join('', @vcs_error), @@ -2848,4 +2861,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); @@ -2921,4 +2935,5 @@ repo_name => $repo_name, repo_password => $repo_password, + submenu => $submenu, filename => \@filename, location => '', @@ -3178,4 +3193,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"); @@ -3225,4 +3241,5 @@ repo_name => $repo_name, repo_password => $repo_password, + submenu => $submenu, filename => \@filename, location => $location, @@ -3243,4 +3260,5 @@ module_name => $module_name, repo_name => $repo_name, + submenu => $submenu, repo_password => $repo_password, filename => \@filename, @@ -3261,4 +3279,5 @@ module_name => $module_name, repo_name => $repo_name, + submenu => $submenu, repo_password => $repo_password, filename => \@filename, @@ -3281,4 +3300,5 @@ repo_name => $repo_name, repo_password => $repo_password, + submenu => $submenu, filename => \@filename, location => $location, @@ -3294,4 +3314,5 @@ ); + $log->debug("submenu passed from create_tag: $submenu"); vcs_menu( ck_auth => $ck_auth, @@ -3300,4 +3321,5 @@ repo_name => $repo_name, repo_password => $repo_password, + submenu => $submenu, filename => \@filename, location => $location, @@ -3319,4 +3341,5 @@ repo_name => $repo_name, repo_password => $repo_password, + submenu => $submenu, filename => \@filename, location => $location, @@ -3396,4 +3419,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; @@ -3442,4 +3466,5 @@ repo_name => $repo_name, repo_password => $repo_password, + submenu => $submenu, filename => \@filename, location => $location, @@ -3461,4 +3486,5 @@ repo_password => $repo_password, filename => \@filename, + submenu => $submenu, location => $location, params => \%params, @@ -3477,4 +3503,5 @@ repo_name => $repo_name, repo_password => $repo_password, + submenu => $submenu, filename => \@filename, location => $location, @@ -3495,4 +3522,5 @@ repo_name => $repo_name, repo_password => $repo_password, + submenu => $submenu, filename => \@filename, location => $location, @@ -3514,4 +3542,5 @@ repo_name => $repo_name, repo_password => $repo_password, + submenu => $submenu, filename => \@filename, location => $location, @@ -3532,4 +3561,5 @@ repo_name => $repo_name, repo_password => $repo_password, + submenu => $submenu, filename => \@filename, location => $location, |