|
From: Shane H. <sha...@us...> - 2005-07-31 02:44:23
|
Update of /cvsroot/sitesampler/sitesampler/SiteSampler In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9121 Modified Files: Account.pm AddProject.pm Data.pm Form.pm Project.pm Log Message: checkin of small bug fixes Index: Data.pm =================================================================== RCS file: /cvsroot/sitesampler/sitesampler/SiteSampler/Data.pm,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Data.pm 22 Jun 2005 01:38:22 -0000 1.1.1.1 --- Data.pm 31 Jul 2005 02:44:13 -0000 1.2 *************** *** 17,21 **** my $self = shift; my $objId = shift; ! my($cgi) = $self->getObjRefs([qw(cgi)]); $self->{'tableHash'} = $self->_tableLookUpHash; $self->_setDataSource; --- 17,21 ---- my $self = shift; my $objId = shift; ! my($cgi) = $self->cgi; $self->{'tableHash'} = $self->_tableLookUpHash; $self->_setDataSource; Index: Form.pm =================================================================== RCS file: /cvsroot/sitesampler/sitesampler/SiteSampler/Form.pm,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Form.pm 22 Jun 2005 01:38:23 -0000 1.1.1.1 --- Form.pm 31 Jul 2005 02:44:13 -0000 1.2 *************** *** 12,16 **** sub validateForm(){ my $self = shift; ! my($cgi,$msgs) = $self->getObjRefs([qw(cgi msgs)]); my @formElement = ''; my $errMsg = ''; --- 12,18 ---- sub validateForm(){ my $self = shift; ! my $cgi = $self->cgi; ! my $msgs = $self->msgs; ! my @formElement = ''; my $errMsg = ''; *************** *** 85,87 **** --- 87,97 ---- } + sub add_error{ + my $self = shift; + my($data_name,$error_msg) = @_; + $self->{$data_name}->{'startFont'} = '<font color="red">'; + $self->{$data_name}->{'endFont'} = '</font>'; + $self->msgs->addErr($error_msg); + } + 1; \ No newline at end of file Index: Project.pm =================================================================== RCS file: /cvsroot/sitesampler/sitesampler/SiteSampler/Project.pm,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Project.pm 22 Jun 2005 01:38:22 -0000 1.1.1.1 --- Project.pm 31 Jul 2005 02:44:13 -0000 1.2 *************** *** 122,125 **** --- 122,126 ---- my $self = shift; my($num_of_agents,$type) = @_; + $num_of_agents = $self->core->check_tag_limit($num_of_agents); for(1..$num_of_agents){ my $agent = SiteSampler::Agent->new; Index: Account.pm =================================================================== RCS file: /cvsroot/sitesampler/sitesampler/SiteSampler/Account.pm,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Account.pm 22 Jun 2005 01:38:23 -0000 1.1.1.1 --- Account.pm 31 Jul 2005 02:44:13 -0000 1.2 *************** *** 32,34 **** --- 32,50 ---- } + sub add_project{ + my $self = shift; + my($projectname,$num_agents,$agent_type) = @_; + my $project; #this acts as a boolean flag that we return to the caller + unless($self->data->objectExists($projectname,'SiteSampler::Project')){ + $project = SiteSampler::Project->new; + $project->ownerid($self->current_user->id); + $project->accountid($self->id); + $project->name($projectname); + $project->save; + $project->add_agents($num_agents,$agent_type); # type is an integer + $project->create_report; #this saves the project after the report is created + } + return($project); + } + 1; \ No newline at end of file Index: AddProject.pm =================================================================== RCS file: /cvsroot/sitesampler/sitesampler/SiteSampler/AddProject.pm,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** AddProject.pm 22 Jun 2005 01:38:21 -0000 1.1.1.1 --- AddProject.pm 31 Jul 2005 02:44:13 -0000 1.2 *************** *** 12,16 **** } ! sub main(){ my $self = shift; if($self->core->checkPermissions($self,$self->current_user) --- 12,16 ---- } ! sub main{ my $self = shift; if($self->core->checkPermissions($self,$self->current_user) *************** *** 18,24 **** && defined($self->cgi->param($self->data->param('reqMethod'))) && $self->form->validateForm ) { - $self->add_project; $self->form->clearValues; } --- 18,24 ---- && defined($self->cgi->param($self->data->param('reqMethod'))) && $self->form->validateForm + && $self->add_project ) { $self->form->clearValues; } *************** *** 27,45 **** sub add_project{ my $self = shift; - - my $type = $self->cgi->param('type'); - my $num_of_agents = $self->core->check_tag_limit($self->cgi->param('numberOfTags')); my $projectname = $self->cgi->param('projectname'); ! ! my $project = SiteSampler::Project->new; ! $project->ownerid($self->current_user->id); ! $project->accountid($self->account->id); ! $project->name($projectname); ! $project->save; ! $project->add_agents($num_of_agents,$type); # type is an integer ! $project->create_report; #this saves the project after the report is created ! return(undef); } - 1; \ No newline at end of file --- 27,47 ---- sub add_project{ my $self = shift; my $projectname = $self->cgi->param('projectname'); ! my $num_agents = $self->cgi->param('numberOfTags'); ! my $agent_type = $self->cgi->param('type'); ! my $account = $self->account; ! my $project_added; ! if($self->data->objectExists($projectname,'SiteSampler::Project')){ ! # if an account with the same name exists, throw an error ! $self->form->add_error('projectname',"A project with the name $projectname already exists. Please choose another name"); ! }elsif($project_added = $account->add_project($projectname,$num_agents,$agent_type)){ ! # attempt to add the project, if success the method returns true ! $self->msgs->addSuccess("Project $projectname added successfully"); ! }else{ ! # this is bad joo jooz!!!!!!!!!! ! $self->msgs->addErr('Critical Error Please Contact the Administrator'); ! } ! return($project_added); } 1; \ No newline at end of file |
