diff --git a/debian/changelog b/debian/changelog index fe8b234..7134ebd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ngcp-www-admin (3.3.5) unstable; urgency=low + + [cveigl] + * propagate syntax error in regex (mantis:1733) + + -- Andrew Pogrebennyk Wed, 20 Jun 2012 09:50:54 +0200 + ngcp-www-admin (3.3.4) unstable; urgency=low [cveigl] diff --git a/lib/admin/Controller/peering.pm b/lib/admin/Controller/peering.pm index 652b9f9..a7ddc66 100644 --- a/lib/admin/Controller/peering.pm +++ b/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 diff --git a/root/tt/peering_detail.tt b/root/tt/peering_detail.tt index cfdf9d2..a454eb1 100644 --- a/root/tt/peering_detail.tt +++ b/root/tt/peering_detail.tt @@ -115,7 +115,14 @@ [% IF !grp.rules || grp.rules.size == 0 %]
Peering Servers of this Peering Group will not be used until at least one Peering Rule is added!
[% END %] [% IF messages.erulmsg %]
[% messages.erulmsg %]
[% END %] - [% IF messages.erulerr %]
[% messages.erulerr %]
[% END %] + [% IF messages.erulerr %] +
[% messages.erulerr %] + [% IF erulerr_detail %] +
+ [% erulerr_detail %] + [% END %] +
+ [% END %]