merge "propagate syntax error in regex (mantis:1733)"

debian/changelog

@@ -1,3 +1,10 @@
+ngcp-www-admin (3.2.1) unstable; urgency=low
+
+  [cveigl]
+  * propagate syntax error in regex (mantis:1733)  
+
+ -- Andrew Pogrebennyk <apogrebennyk@sipwise.com>  Wed, 20 Jun 2012 09:54:40 +0200
+
 ngcp-www-admin (3.2.0) unstable; urgency=low
 
   * support for subscriber alias numbers

lib/admin/Controller/peering.pm

@@ -243,6 +243,10 @@ sub create_rule : Local {
 		else
 		{
         	$messages{erulerr} = 'Client.Voip.InputErrorFound';
+            if ($c->session->{prov_error_object}) {
+                # put into flash (read-once), %messages is translated which will not work here.
+                $c->flash->{erulerr_detail} = $c->session->{prov_error_object};
+            } 
 		}
     } else {
 		# TODO: add proper values here and set them in tt

root/tt/peering_detail.tt

@@ -115,7 +115,14 @@
 
 	  [% IF !grp.rules || grp.rules.size == 0 %]<div class="notice">Peering Servers of this Peering Group will not be used until at least one Peering Rule is added!</div>[% END %]
           [% IF messages.erulmsg %]<div class="success">[% messages.erulmsg %]</div>[% END %]
-          [% IF messages.erulerr %]<div class="error">[% messages.erulerr %]</div>[% END %]
+          [% IF messages.erulerr %]
+              <div class="error">[% messages.erulerr %]
+              [% IF erulerr_detail %]
+                  <br />
+                  [% erulerr_detail %]
+              [% END %]
+              </div>
+          [% END %]
 
           <ul class="cleanlist">
             <li class="ui-state-default">