From 58c6318fe8f064cea2454ee0c27b6fc840b15188 Mon Sep 17 00:00:00 2001 From: Daniel Tiefnig Date: Tue, 31 Jan 2012 15:07:03 +0000 Subject: [PATCH 1/4] number normalization for adm block lists maybe this should actually be obsoleted by a change in the number format handling, but fixing it nevertheless, as it causes some problems in older versions of the interface (3.0 at least) --- lib/admin/Controller/subscriber.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/admin/Controller/subscriber.pm b/lib/admin/Controller/subscriber.pm index b9f79b0..9a32ecd 100644 --- a/lib/admin/Controller/subscriber.pm +++ b/lib/admin/Controller/subscriber.pm @@ -735,7 +735,9 @@ sub preferences : Local { \$rules ); $c->stash->{rewrite_rule_sets} = $rules if eval { @$rules }; - } elsif($$pref{preference} eq 'block_in_list' or $$pref{preference} eq 'block_out_list') { + } elsif($$pref{preference} eq 'block_in_list' or $$pref{preference} eq 'block_out_list' or + $$pref{preference} eq 'adm_block_in_list' or $$pref{preference} eq 'adm_block_out_list') + { eval { @{$$preferences{$$pref{preference}}} = map { s/^([1-9])/+$1/; $_ } @{$$preferences{$$pref{preference}}} }; } From 130e0bd0c12205bab0e2dac514df11ef13d09b40 Mon Sep 17 00:00:00 2001 From: Andreas Granig Date: Wed, 1 Feb 2012 14:03:42 +0000 Subject: [PATCH 2/4] Fix fetching of voicebox/faxserver preferences. --- lib/admin/Controller/subscriber.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/admin/Controller/subscriber.pm b/lib/admin/Controller/subscriber.pm index 9a32ecd..860c21d 100644 --- a/lib/admin/Controller/subscriber.pm +++ b/lib/admin/Controller/subscriber.pm @@ -618,7 +618,7 @@ sub preferences : Local { { username => $$subscriber{username}, domain => $$subscriber{domain}, }, - $$subscriber{voicebox_preferences} + \$$subscriber{voicebox_preferences} ); } @@ -634,7 +634,7 @@ sub preferences : Local { { username => $$subscriber{username}, domain => $$subscriber{domain}, }, - $$subscriber{fax_preferences} + \$$subscriber{fax_preferences} ); } From 064473f8c556f8e8bd4c8879dd09855710c308aa Mon Sep 17 00:00:00 2001 From: Andrew Pogrebennyk Date: Wed, 1 Feb 2012 15:56:23 +0000 Subject: [PATCH 3/4] changelog for the new version --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index e8fc2b6..d888953 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ngcp-www-admin (3.3.2) unstable; urgency=low + + [ agranig ] + * Fix fetching of voicebox/faxserver preferences. + + -- Andrew Pogrebennyk Wed, 01 Feb 2012 16:54:39 +0100 + ngcp-www-admin (3.3.1) unstable; urgency=low [ agranig ] From 528f312cf04c8434bd6b5833dda0f809c829026d Mon Sep 17 00:00:00 2001 From: Andrew Pogrebennyk Date: Wed, 1 Feb 2012 15:58:33 +0000 Subject: [PATCH 4/4] one more change needs merge --- debian/changelog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index d888953..2eb6446 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ ngcp-www-admin (3.3.2) unstable; urgency=low [ agranig ] * Fix fetching of voicebox/faxserver preferences. + [ dtiefnig ] + * number normalization for adm block lists + -- Andrew Pogrebennyk Wed, 01 Feb 2012 16:54:39 +0100 ngcp-www-admin (3.3.1) unstable; urgency=low