From a3da63bcda73ef141d43521ff6dbd222fcb45568 Mon Sep 17 00:00:00 2001
From: Christian Veigl <cveigl@sipwise.com>
Date: Fri, 17 Aug 2012 14:31:21 +0000
Subject: [PATCH] update admin-interface to support sound_set handling
 introduced with r10333 (see also: mantis:1897)

---
 lib/admin/Controller/domain.pm     |  2 +-
 lib/admin/Controller/peering.pm    |  2 +-
 lib/admin/Controller/sound.pm      | 11 +++++------
 lib/admin/Controller/subscriber.pm |  2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/lib/admin/Controller/domain.pm b/lib/admin/Controller/domain.pm
index 02e6203..2ce91b6 100644
--- a/lib/admin/Controller/domain.pm
+++ b/lib/admin/Controller/domain.pm
@@ -156,7 +156,7 @@ sub preferences : Local {
         }
         elsif ($$pref{preference} eq 'sound_set') {
             my $sound_sets;
-            return unless $c->model('Provisioning')->call_prov( $c, 'voip', 'get_sound_sets_flat', 
+            return unless $c->model('Provisioning')->call_prov( $c, 'voip', 'get_sound_sets', 
                 {},
                 \$sound_sets );
 
diff --git a/lib/admin/Controller/peering.pm b/lib/admin/Controller/peering.pm
index 6ed4a36..17cffbc 100644
--- a/lib/admin/Controller/peering.pm
+++ b/lib/admin/Controller/peering.pm
@@ -545,7 +545,7 @@ sub preferences : Local {
         }
         elsif ($$pref{preference} eq 'sound_set') {
             my $sound_sets;
-            return unless $c->model('Provisioning')->call_prov( $c, 'voip', 'get_sound_sets_flat', 
+            return unless $c->model('Provisioning')->call_prov( $c, 'voip', 'get_sound_sets', 
                 {},
                 \$sound_sets );
 
diff --git a/lib/admin/Controller/sound.pm b/lib/admin/Controller/sound.pm
index e3a245a..f1d4663 100644
--- a/lib/admin/Controller/sound.pm
+++ b/lib/admin/Controller/sound.pm
@@ -33,7 +33,7 @@ sub list : Chained('base') PathPart('') Args(0) {
 sub set : Chained('base') PathPart('set') CaptureArgs(1) {
     my ($self, $c, $set_id) = @_;
     $c->stash->{set_id} = $set_id if ($set_id != 0);
-    $c->stash->{set} = $c->forward ('load_single_set') if ($set_id != 0);
+    $c->stash->{set} = $c->forward ('load_set') if ($set_id != 0);
 }
 
 sub set_add : Chained('base') PathPart('set') CaptureArgs(0) {
@@ -66,7 +66,6 @@ sub save_handle : Chained('handle') PathPart('save') Args(0) {
         my $ft = File::Type->new();
 
         unless ($ft->checktype_contents($soundfile) eq 'audio/x-wav') {
-            ##$messages{sound_set_err} = 'Client.Syntax.InvalidFileType';
             $c->session->{messages} = {sound_set_err => 'Client.Syntax.InvalidFileType'};
             $c->session->{refill} = { set_id => $c->stash->{set_id}, handle_id => $c->stash->{handle_id}, filename => $filename };
             return;
@@ -74,12 +73,12 @@ sub save_handle : Chained('handle') PathPart('save') Args(0) {
     }
 
     if ($c->model('Provisioning')->call_prov($c, 'voip',
-        'update_sound_handle',
+        'update_sound_file',
         { set_id => $c->stash->{set_id},
           handle_id => $c->stash->{handle_id},
           soundfile => $soundfile,
           filename => $filename, 
-          loopplay => $c->request->params->{loopplay} eq 'on' ? 1 : 0,
+          loopplay => (defined $c->request->params->{loopplay} and $c->request->params->{loopplay} eq 'on') ? 1 : 0,
         },
         undef))
     {
@@ -213,14 +212,14 @@ sub load_sets :Private {
     return $sets;
 }
 
-sub load_single_set :Private {
+sub load_set :Private {
     my ($self, $c) = @_;
 
     my $set;
     return unless $c->model('Provisioning')->call_prov(
         $c,
         'voip',
-        'get_single_sound_set',
+        'get_sound_set',
         { set_id => $c->stash->{set_id} },
         \$set,
     );
diff --git a/lib/admin/Controller/subscriber.pm b/lib/admin/Controller/subscriber.pm
index 2f20af1..7ef11e1 100644
--- a/lib/admin/Controller/subscriber.pm
+++ b/lib/admin/Controller/subscriber.pm
@@ -812,7 +812,7 @@ sub preferences : Local {
         }
         elsif ($$pref{preference} eq 'sound_set') {
             my $sound_sets;
-            return unless $c->model('Provisioning')->call_prov( $c, 'voip', 'get_sound_sets_flat', 
+            return unless $c->model('Provisioning')->call_prov( $c, 'voip', 'get_sound_sets', 
                 {},
                 \$sound_sets );