From 417e89b74013047c5c84653c63f715e0de1dba21 Mon Sep 17 00:00:00 2001
From: Andreas Granig <agranig@sipwise.com>
Date: Thu, 4 Sep 2014 17:05:37 +0200
Subject: [PATCH] MT#8279 Don't skip preference logic on empty vals.

This actually triggered the empty enum bug, and also influences
setting special helper vars for rwr (and probably others), so remove.
---
 lib/NGCP/Panel/Utils/Preferences.pm | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/lib/NGCP/Panel/Utils/Preferences.pm b/lib/NGCP/Panel/Utils/Preferences.pm
index 8aa09635c3..7d8badedfd 100644
--- a/lib/NGCP/Panel/Utils/Preferences.pm
+++ b/lib/NGCP/Panel/Utils/Preferences.pm
@@ -66,20 +66,11 @@ sub load_preference_list {
         
         foreach my $pref(@group_prefs) {
 
-            if($pref->data_type eq "enum") {
-                $pref->{enums} = [];
-                my @enums = $pref->voip_preferences_enums->all;
-                use Data::Printer; print "++++++++++++++++++++++++ enums\n"; p @enums;
-                push @{ $pref->{enums} }, @enums;
-            }
-
             my @values = @{
                 exists $pref_values->{$pref->attribute}
                     ? $pref_values->{$pref->attribute}
                     : []
             };
-            next unless(scalar @values);
-
             if($pref->attribute eq "rewrite_rule_set") {
                 my $tmp;
                 $pref->{rwrs_id} = $pref_values->{rewrite_caller_in_dpid} &&
@@ -130,6 +121,13 @@ sub load_preference_list {
                     $v = $prefix . $v;
                 }
             }
+
+            if($pref->data_type eq "enum") {
+                $pref->{enums} = [];
+                my @enums = $pref->voip_preferences_enums->all;
+                push @{ $pref->{enums} }, @enums;
+            }
+
             if($pref->max_occur != 1) {
                 $pref->{value} = \@values;
             } else {