Umstellung Form::throw_on_error auf Verwendung von Exception::Lite anstelle von Hashrefs

diff --git a/SL/BackgroundJob/CreatePeriodicInvoices.pm b/SL/BackgroundJob/CreatePeriodicInvoices.pm
index c725a6fec173c83fc7a8e591e609abb998d49c14..559fd0299d94ea0a49458a260b1da2b99cd29e8e 100644 (file)
--- a/SL/BackgroundJob/CreatePeriodicInvoices.pm
+++ b/SL/BackgroundJob/CreatePeriodicInvoices.pm
@@ -240,7 +240,7 @@ sub _print_invoice {
     eval {
       $form->parse_template(\%::myconfig);
       1;
     eval {
       $form->parse_template(\%::myconfig);
       1;

-    } || die $EVAL_ERROR->{error};
+    } || die $EVAL_ERROR->getMessage;

   });
 }
 
   });
 }
 

diff --git a/SL/Form.pm b/SL/Form.pm
index b63421750cdb9bf055616e1eccb618d8c591c8ea..b3a3e23dff21756173b119f7ab689f28362d702c 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -62,6 +62,7 @@ use SL::Menu;
 use SL::OE;
 use SL::Template;
 use SL::User;
 use SL::OE;
 use SL::Template;
 use SL::User;

+use SL::X;

 use Template;
 use URI;
 use List::Util qw(first max min sum);
 use Template;
 use URI;
 use List::Util qw(first max min sum);


@@ -458,7 +459,7 @@ sub hide_form {
 
 sub throw_on_error {
   my ($self, $code) = @_;
 
 sub throw_on_error {
   my ($self, $code) = @_;

-  local $self->{__ERROR_HANDLER} = sub { die({ error => $_[0] }) };
+  local $self->{__ERROR_HANDLER} = sub { die SL::X::FormError->new($_[0]) };

   $code->();
 }
 
   $code->();
 }
 

diff --git a/SL/X.pm b/SL/X.pm
new file mode 100644 (file)
index 0000000..ce7552c
--- /dev/null
+++ b/SL/X.pm
@@ -0,0 +1,9 @@
+package SL::X;
+
+use strict;
+
+use Exception::Lite qw(declareExceptionClass);
+
+declareExceptionClass('SL::X::FormError');
+
+1;