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

More charset hackery

Browse source
This commit is contained in:
Eelco Dolstra 2014-08-23 16:39:16 +02:00
parent f5c04bfa49
commit d6b61f4925
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -22,6 +22,7 @@ sub noLoginNeeded {
$c->request->path =~ /^static\//; $c->request->path =~ /^static\//;
} }
sub begin :Private { sub begin :Private {
my ($self, $c, @args) = @_; my ($self, $c, @args) = @_;
@ -196,11 +197,10 @@ sub default :Path {
sub end : ActionClass('RenderView') { sub end : ActionClass('RenderView') {
my ($self, $c) = @_; my ($self, $c) = @_;
my @errors = map { encode_utf8($_); } @{$c->error};
if (defined $c->stash->{json}) { if (defined $c->stash->{json}) {
if (scalar @errors) { if (scalar @{$c->error}) {
$c->stash->{json}->{error} = join "\n", @errors; # FIXME: dunno why we need to do decode_utf8 here.
$c->stash->{json}->{error} = join "\n", map { decode_utf8($_); } @{$c->error};
$c->clear_errors; $c->clear_errors;
} }
$c->forward('View::JSON'); $c->forward('View::JSON');
@ -209,7 +209,7 @@ sub end : ActionClass('RenderView') {
elsif (scalar @{$c->error}) { elsif (scalar @{$c->error}) {
$c->stash->{resource} = { error => join "\n", @{$c->error} }; $c->stash->{resource} = { error => join "\n", @{$c->error} };
$c->stash->{template} = 'error.tt'; $c->stash->{template} = 'error.tt';
$c->stash->{errors} = [@errors]; $c->stash->{errors} = $c->error;
$c->response->status(500) if $c->response->status == 200; $c->response->status(500) if $c->response->status == 200;
if ($c->response->status >= 300) { if ($c->response->status >= 300) {
$c->stash->{httpStatus} = $c->stash->{httpStatus} =