oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

minor changes

Browse source
This commit is contained in:
Kaleb Murphy 2008-09-26 14:18:36 +00:00
parent 92c87ca9b8
commit ac14d55b18
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/WebGUI/Asset/Wobject/Survey.pm
View file

@ -256,7 +256,10 @@ sub deleteObject{
$self->saveSurveyJSON(); $self->saveSurveyJSON();
#The last address in ideas is to a deleted object so that should not be returned. #The last address in ideas is to a deleted object so that should not be returned.
pop(@{$address}); pop(@{$address});
if(@$address < 1){
$$address[0] = 0;
}
return $self->www_loadSurvey({address => $address, message=>$message}); return $self->www_loadSurvey({address => $address, message=>$message});
} }
@ -399,8 +402,10 @@ $self->session->errorHandler->error("Loaded JSON");
my $address = $options->{address} ? defined $options : [0]; my $address = $options->{address} ? defined $options : [0];
my $message = $options->{message} ? defined $options : ''; my $message = $options->{message} ? defined $options : '';
$self->session->errorHandler->error("Getting edit vars");
my $var = $options->{var} ? defined $options : $self->{_data}->getEditVars($address); my $var = $options->{var} ? defined $options : $self->{_data}->getEditVars($address);
$self->session->errorHandler->error("Loaded beginning params"); $self->session->errorHandler->error("Got edit vars");
$self->session->errorHandler->error("Loaded beginning params ".@$address);
my $editHtml; my $editHtml;
if($var->{type} eq 'section'){ if($var->{type} eq 'section'){
$var->{id} = join('-',@$address); $var->{id} = join('-',@$address);

2
lib/WebGUI/Asset/Wobject/Survey/SectionJSON.pm
View file

@ -54,6 +54,7 @@ sub getObject{
} }
sub getEditVars{ sub getEditVars{
my ($self,$address) = @_; my ($self,$address) = @_;
$self->{log}->error("section geteditvars");
if(@$address > 1){ if(@$address > 1){
return $self->{questions}->[$address->[1]]->getEditVars($address); return $self->{questions}->[$address->[1]]->getEditVars($address);
} }
@ -139,7 +140,6 @@ sub freeze{
foreach(@{$self->{questions}}){ foreach(@{$self->{questions}}){
push(@{$temp{questions}}, $_->freeze()); push(@{$temp{questions}}, $_->freeze());
} }
$temp{log} = undef;
delete $temp{log}; delete $temp{log};
return \%temp; return \%temp;
} }

7
lib/WebGUI/Asset/Wobject/Survey/SurveyJSON.pm
View file

@ -49,6 +49,7 @@ sub getObject{
sub getEditVars{ sub getEditVars{
my ($self,$address) = @_; my ($self,$address) = @_;
$self->{log}->error("SurveyJSON geteditvars for: ".@$address);
return $self->{sections}->[$address->[0]]->getEditVars($address); return $self->{sections}->[$address->[0]]->getEditVars($address);
} }
@ -90,12 +91,6 @@ sub freeze{
foreach (@{$self->{sections}}){ foreach (@{$self->{sections}}){
push(@{$temp{sections}},$_->freeze()); push(@{$temp{sections}},$_->freeze());
} }
foreach my $key (keys %temp){
if($key ne 'log'){
$self->{log}->error("$key $temp{$key}");
}
}
$temp{log} = undef;
delete $temp{log}; delete $temp{log};
return \%temp; return \%temp;
} }