diff --git a/lib/WebGUI/Asset/Wobject/Survey.pm b/lib/WebGUI/Asset/Wobject/Survey.pm index b90ebe829..fa7dae96e 100644 --- a/lib/WebGUI/Asset/Wobject/Survey.pm +++ b/lib/WebGUI/Asset/Wobject/Survey.pm @@ -256,7 +256,10 @@ sub deleteObject{ $self->saveSurveyJSON(); #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}); } @@ -399,8 +402,10 @@ $self->session->errorHandler->error("Loaded JSON"); my $address = $options->{address} ? defined $options : [0]; my $message = $options->{message} ? defined $options : ''; +$self->session->errorHandler->error("Getting edit vars"); 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; if($var->{type} eq 'section'){ $var->{id} = join('-',@$address); diff --git a/lib/WebGUI/Asset/Wobject/Survey/SectionJSON.pm b/lib/WebGUI/Asset/Wobject/Survey/SectionJSON.pm index fcb6c72fb..87c4edfd9 100644 --- a/lib/WebGUI/Asset/Wobject/Survey/SectionJSON.pm +++ b/lib/WebGUI/Asset/Wobject/Survey/SectionJSON.pm @@ -54,6 +54,7 @@ sub getObject{ } sub getEditVars{ my ($self,$address) = @_; +$self->{log}->error("section geteditvars"); if(@$address > 1){ return $self->{questions}->[$address->[1]]->getEditVars($address); } @@ -139,7 +140,6 @@ sub freeze{ foreach(@{$self->{questions}}){ push(@{$temp{questions}}, $_->freeze()); } - $temp{log} = undef; delete $temp{log}; return \%temp; } diff --git a/lib/WebGUI/Asset/Wobject/Survey/SurveyJSON.pm b/lib/WebGUI/Asset/Wobject/Survey/SurveyJSON.pm index 7ed3fc57a..a43124815 100644 --- a/lib/WebGUI/Asset/Wobject/Survey/SurveyJSON.pm +++ b/lib/WebGUI/Asset/Wobject/Survey/SurveyJSON.pm @@ -49,6 +49,7 @@ sub getObject{ sub getEditVars{ my ($self,$address) = @_; +$self->{log}->error("SurveyJSON geteditvars for: ".@$address); return $self->{sections}->[$address->[0]]->getEditVars($address); } @@ -90,12 +91,6 @@ sub freeze{ foreach (@{$self->{sections}}){ 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}; return \%temp; }