From 5e5b221bbf5d0f99faba89532be0e56b79e564e7 Mon Sep 17 00:00:00 2001
From: Gerhard Jungwirth <gjungwirth@sipwise.com>
Date: Tue, 9 Jul 2013 15:19:48 +0200
Subject: [PATCH] fix bug in enum display

in the modal to edit preferences only relevant enums should be displayed
---
 lib/NGCP/Panel/Controller/Domain.pm  | 6 ++++++
 lib/NGCP/Panel/Controller/Peering.pm | 5 +++++
 lib/NGCP/Panel/Utils.pm              | 8 +++-----
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/lib/NGCP/Panel/Controller/Domain.pm b/lib/NGCP/Panel/Controller/Domain.pm
index 5da49c4112..0e4d4d97ab 100644
--- a/lib/NGCP/Panel/Controller/Domain.pm
+++ b/lib/NGCP/Panel/Controller/Domain.pm
@@ -222,10 +222,16 @@ sub preferences_edit :Chained('preferences_base') :PathPart('edit') :Args(0) {
    
     $c->stash(edit_preference => 1);
     
+    my @enums = $c->stash->{preference_meta}
+        ->voip_preferences_enums
+        ->search({dom_pref => 1})
+        ->all;
+
     my $pref_rs = $c->stash->{preference};
 
     NGCP::Panel::Utils::create_preference_form( c => $c,
         pref_rs => $pref_rs,
+        enums   => \@enums,
         base_uri => $c->uri_for_action('/domain/preferences', [$c->req->captures->[0]]),
         edit_uri => $c->uri_for_action('/domain/preferences_edit', $c->req->captures),
     );
diff --git a/lib/NGCP/Panel/Controller/Peering.pm b/lib/NGCP/Panel/Controller/Peering.pm
index 2b5cad2d7f..46f90cda96 100644
--- a/lib/NGCP/Panel/Controller/Peering.pm
+++ b/lib/NGCP/Panel/Controller/Peering.pm
@@ -322,11 +322,16 @@ sub servers_preferences_edit :Chained('servers_preferences_base') :PathPart('edi
     my ($self, $c) = @_;
    
     $c->stash(edit_preference => 1);
+
+    my @enums = $c->stash->{preference_meta}
+        ->voip_preferences_enums
+        ->all;
     
     my $pref_rs = $c->stash->{server_result}->voip_peer_preferences;
 
     NGCP::Panel::Utils::create_preference_form( c => $c,
         pref_rs => $pref_rs,
+        enums   => \@enums,
         base_uri => $c->uri_for_action('/peering/servers_preferences_root', [@{ $c->req->captures }[0,1]]),
         edit_uri => $c->uri_for_action('/peering/servers_preferences_edit', $c->req->captures),
     );
diff --git a/lib/NGCP/Panel/Utils.pm b/lib/NGCP/Panel/Utils.pm
index ffce4420f9..d741278c4c 100644
--- a/lib/NGCP/Panel/Utils.pm
+++ b/lib/NGCP/Panel/Utils.pm
@@ -118,15 +118,12 @@ sub create_preference_form {
     my $pref_rs = $params{pref_rs};
     my $base_uri = $params{base_uri};
     my $edit_uri = $params{edit_uri};
-    
-    my @enums = $c->stash->{preference_meta}
-        ->voip_preferences_enums
-        ->all;
+    my $enums    = $params{enums};
 
     my $form = NGCP::Panel::Form::Preferences->new({
         fields_data => [{
             meta => $c->stash->{preference_meta},
-            enums => \@enums,
+            enums => $enums,
         }],
     });
     $form->create_structure([$c->stash->{preference_meta}->attribute]);
@@ -233,6 +230,7 @@ Put them to stash as "pref_groups". This will be used in F<helpers/pref_table.tt
 Parameters:
     c - set this to $c
     pref_rs - a resultset for voip_x_preferences with the specific "x" already set
+    enums - arrayref of all relevant enum rows (already filtered by eg. dom_pref)
     base_uri - string, uri of the preferences list
     edit_uri - string, uri to show the preferences edit modal