Enable flash-to-stash.

Display errors from ossbss if regex is invalid.

lib/admin.pm

@@ -36,6 +36,8 @@ our $VERSION = '3';
 my $xs = new XML::Simple;
 my $xc = $xs->XMLin( '/etc/ngcp-www-admin/admin.conf', ForceArray => 0);
 
+__PACKAGE__->config(session => { flash_to_stash => 1 });
+
 __PACKAGE__->config( %$xc );
 __PACKAGE__->config( 'Plugin::Authentication' => {
         default_realm => 'default',

lib/admin/Controller/domain.pm

@@ -148,7 +148,7 @@ sub create_rewrite : Local {
     elsif($field eq 'callee') { $a = 'callee'.$a; }
     if($direction eq 'in') { $a = 'i'.$a; }
     elsif($direction eq 'out') { $a = 'o'.$a; }
-    my $m = $a.'msg'; my $e = $a.'err';
+    my $m = $a.'msg'; my $e = $a.'err'; my $d = $a.'detail';
 
     unless(keys %messages) {
         if($c->model('Provisioning')->call_prov( $c, 'voip', 'create_domain_rewrite',
@@ -173,6 +173,9 @@ sub create_rewrite : Local {
         else
         {
             $messages{$e} = 'Client.Voip.InputErrorFound';
+            if($c->session->{prov_error_object}) {
+              $c->flash->{$d} = $c->session->{prov_error_object};
+            }
         }
     } else {
     }
@@ -208,7 +211,7 @@ sub edit_rewrite : Local {
     elsif($field eq 'callee') { $a = 'callee'.$a; }
     if($direction eq 'in') { $a = 'i'.$a; }
     elsif($direction eq 'out') { $a = 'o'.$a; }
-    my $m = $a.'msg'; my $e = $a.'err';
+    my $m = $a.'msg'; my $e = $a.'err'; my $d = $a.'detail';
 
     unless(keys %messages) {
         if($c->model('Provisioning')->call_prov( $c, 'voip', 'update_domain_rewrite',
@@ -233,6 +236,9 @@ sub edit_rewrite : Local {
         else
         {
             $messages{$e} = 'Client.Voip.InputErrorFound';
+            if($c->session->{prov_error_object}) {
+              $c->flash->{$d} = $c->session->{prov_error_object};
+            }
         }
     } else {
     }

lib/admin/Controller/peering.pm

@@ -571,7 +571,7 @@ sub create_rewrite : Local {
 	elsif($field eq 'callee') { $a = 'callee'.$a; }
 	if($direction eq 'in') { $a = 'i'.$a; }
 	elsif($direction eq 'out') { $a = 'o'.$a; }
-	my $m = $a.'msg'; my $e = $a.'err';
+        my $m = $a.'msg'; my $e = $a.'err'; my $d = $a.'detail';
 
 #    $messages{crulerr} = 'Client.Syntax.MalformedPeerGroupName'
 #        unless $callee_prefix =~ /^[a-zA-Z0-9_\.\-\@\:]+/;
@@ -599,6 +599,9 @@ sub create_rewrite : Local {
 		else
 		{
         	$messages{$e} = 'Client.Voip.InputErrorFound';
+                if($c->session->{prov_error_object}) {
+                  $c->flash->{$d} = $c->session->{prov_error_object};
+                }
 		}
     } else {
 		# TODO: add proper values here and set them in tt
@@ -731,7 +734,7 @@ sub edit_rewrite : Local {
 	elsif($field eq 'callee') { $a = 'callee'.$a; }
 	if($direction eq 'in') { $a = 'i'.$a; }
 	elsif($direction eq 'out') { $a = 'o'.$a; }
-	my $m = $a.'msg'; my $e = $a.'err';
+        my $m = $a.'msg'; my $e = $a.'err'; my $d = $a.'detail';
 
 #    $messages{crulerr} = 'Client.Syntax.MalformedPeerGroupName'
 #        unless $callee_prefix =~ /^[a-zA-Z0-9_\.\-\@\:]+/;
@@ -759,6 +762,9 @@ sub edit_rewrite : Local {
 		else
 		{
         	$messages{$e} = 'Client.Voip.InputErrorFound';
+                if($c->session->{prov_error_object}) {
+                  $c->flash->{$d} = $c->session->{prov_error_object};
+                }
 		}
     } else {
 		# TODO: add proper values here and set them in tt

root/tt/domain_rewrite.tt

@@ -54,6 +54,7 @@
               field = 'caller',
               msg = messages.icallermsg,
               err = messages.icallererr,
+              detail = icallerdetail,
               rules = domain.rewrite_in_caller,
             },
             {
@@ -64,6 +65,7 @@
               field = 'callee',
               msg = messages.icalleemsg,
               err = messages.icalleeerr,
+              detail = icalleedetail,
               rules = domain.rewrite_in_callee,
             },
             {
@@ -74,6 +76,7 @@
               field = 'caller',
               msg = messages.ocallermsg,
               err = messages.ocallererr,
+              detail = ocallerdetail,
               rules = domain.rewrite_out_caller,
             },
           ]
@@ -84,7 +87,7 @@
         <h3 id="[% rw.id %]">[% rw.header %]</h3>
 
           [% IF rw.msg %]<div class="success">[% rw.msg %]</div>[% END %]
-          [% IF rw.err %]<div class="error">[% rw.err %]</div>[% END %]
+          [% IF rw.err %]<div class="error">[% rw.err %][% IF rw.detail %]<br/>[% rw.detail %][% END %]</div>[% END %]
 
             <ul class="cleanlist">
               <li class="ui-state-default">

root/tt/peering_rewrite.tt

@@ -82,6 +82,7 @@
               field = 'caller',
               msg = messages.icallermsg,
               err = messages.icallererr,
+              detail = icallerdetail,
               rules = peer.rewrite_in_caller,
             },
             {
@@ -92,6 +93,7 @@
               field = 'callee',
               msg = messages.icalleemsg,
               err = messages.icalleeerr,
+              detail = icalleedetail,
               rules = peer.rewrite_in_callee,
             },
             {
@@ -102,6 +104,7 @@
               field = 'caller',
               msg = messages.ocallermsg,
               err = messages.ocallererr,
+              detail = ocallerdetail,
               rules = peer.rewrite_out_caller,
             },
             {
@@ -112,6 +115,7 @@
               field = 'callee',
               msg = messages.ocalleemsg,
               err = messages.ocalleeerr,
+              detail = ocalleedetail,
               rules = peer.rewrite_out_callee,
             },
           ]
@@ -121,7 +125,7 @@
 
         <h3 id="[% rw.id %]">[% rw.header %]</h3>
           [% IF rw.msg %]<div class="success">[% rw.msg %]</div>[% END %]
-          [% IF rw.err %]<div class="error">[% rw.err %]</div>[% END %]
+          [% IF rw.err %]<div class="error">[% rw.err %][% IF rw.detail %]<br/>[% rw.detail %][% END %]</div>[% END %]
 
             <ul class="cleanlist">
               <li class="ui-state-default">