snaakey/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Clean up error handling

Browse source
This commit is contained in:
Eelco Dolstra 2013-10-03 14:45:23 +02:00
parent 4ddb173ca1
commit c8e5faf81e
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/lib/Hydra/Controller/Root.pm
View file

@ -223,8 +223,8 @@ sub end : ActionClass('RenderView') {
$c->forward('View::JSON'); $c->forward('View::JSON');
} }
if (scalar @{$c->error}) { elsif (scalar @{$c->error}) {
$c->stash->{resource} = { errors => $c->error }; $c->stash->{resource} = { error => join "\n", @{$c->error} };
$c->stash->{template} = 'error.tt'; $c->stash->{template} = 'error.tt';
$c->stash->{errors} = $c->error; $c->stash->{errors} = $c->error;
$c->response->status(500) if $c->response->status == 200; $c->response->status(500) if $c->response->status == 200;
@ -233,17 +233,12 @@ sub end : ActionClass('RenderView') {
$c->response->status . " " . HTTP::Status::status_message($c->response->status); $c->response->status . " " . HTTP::Status::status_message($c->response->status);
} }
$c->clear_errors; $c->clear_errors;
} elsif (defined $c->stash->{resource} and
(ref $c->stash->{resource} eq ref {}) and
defined $c->stash->{resource}->{error}) {
$c->stash->{template} = 'error.tt';
$c->stash->{httpStatus} =
$c->response->status . " " . HTTP::Status::status_message($c->response->status);
} }
$c->forward('serialize') if defined $c->stash->{resource}; $c->forward('serialize') if defined $c->stash->{resource};
} }
sub serialize : ActionClass('Serialize') { } sub serialize : ActionClass('Serialize') { }