Merge branch 'master' into feature/#17

Conflicts: app/views/exceptionhandler/index.html.erb
2012-04-29 00:52:41 -04:00
parent 0d2640a8ab d6f69b6358
commit 9ebea9bc1f
2 changed files with 5 additions and 5 deletions
--- a/app/controllers/exceptionhandler_controller.rb
+++ b/app/controllers/exceptionhandler_controller.rb
@@ -63,7 +63,8 @@ class ExceptionhandlerController < ApplicationController
           issue.save
           flash.now[:notice] = "New report filed: ##{issue.id}"
        else
-          flash.now[:error] = issue.errors.full_messages
+          flash.now[:error] = "There was an error with filing this report"
+          @output = issue.errors.full_messages
        end

        #TODO generate link to issue