MT#5465 preferences_enum stop using default_val

The real default enum option is the one with value set to NULL
13 years ago · 11841b2bba
parent 8cdf9c7880
commit 11841b2bba
2 changed files with 2 additions and 4 deletions
--- a/lib/NGCP/Panel/Utils/Preferences.pm
+++ b/lib/NGCP/Panel/Utils/Preferences.pm
@ -319,9 +319,7 @@ sub create_preference_form {
            if( ($c->stash->{preference_meta}->data_type ne 'enum' &&
                $form->field($attribute)->value eq '') ||
                ($c->stash->{preference_meta}->data_type eq 'enum' &&
-                $c->stash->{preference_meta}->voip_preferences_enums->find({
-                    value => $form->field($attribute)->value
-                })->default_val == 1)
+                ! defined $form->field($attribute)->value)
                ) {
                my $preference = $pref_rs->find($preference_id);
                $preference->delete if $preference;
--- a/share/templates/helpers/pref_table.tt
+++ b/share/templates/helpers/pref_table.tt
@ -126,7 +126,7 @@
                    [% ELSIF r.data_type == "enum" %]
                        <select disabled="disabled">
                        [% FOREACH e IN r.enums %]
-                            <option [% IF r.value == e.value || (!r.value.defined && e.default_val == 1) %]selected="selected"[% END %]>[% e.label %]</option>
+                            <option [% IF r.value == e.value || (!r.value.defined && ! e.value.defined) %]selected="selected"[% END %]>[% e.label %]</option>
                        [% END %]
                        </select>
                    [% END %]