From c8e5faf81ee22c378614f3328757bb86ed232b91 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 3 Oct 2013 14:45:23 +0200
Subject: [PATCH] Clean up error handling

---
 src/lib/Hydra/Controller/Root.pm | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/lib/Hydra/Controller/Root.pm b/src/lib/Hydra/Controller/Root.pm
index efc8f130..0fcf4ccc 100644
--- a/src/lib/Hydra/Controller/Root.pm
+++ b/src/lib/Hydra/Controller/Root.pm
@@ -223,8 +223,8 @@ sub end : ActionClass('RenderView') {
         $c->forward('View::JSON');
     }
 
-    if (scalar @{$c->error}) {
-        $c->stash->{resource} = { errors => $c->error };
+    elsif (scalar @{$c->error}) {
+        $c->stash->{resource} = { error => join "\n", @{$c->error} };
         $c->stash->{template} = 'error.tt';
         $c->stash->{errors} = $c->error;
         $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->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};
 }
 
+
 sub serialize : ActionClass('Serialize') { }