sipwise
/
ngcp-panel
mirror of https://github.com/sipwise/ngcp-panel.git
1
0
Fork 0
Code Issues Releases Wiki Activity

MT#56802 fix preferences default values selection

Browse Source 
* preferences form with enum values now set the default one as
  selected if no preference is set yet.
* disable autocomplete for the preferences table fields. this
  addresses Firefox using incorrect selected values even though
  the correct data is sent by the server.

Change-Id: I6865eec05c085b89e651b125a7f35724859ccbc2
(cherry picked from commit 3c1842c122)
(cherry picked from commit 33e39cdac5)
mr10.5.4
Kirill Solomko 2 years ago
parent 4176e8820d
commit afc6a7ed69
2 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File

8
lib/NGCP/Panel/Utils/Preferences.pm
Unescape View File

@ -12,6 +12,7 @@ use HTTP::Status qw(:constants);
use File::Type;
use Readonly;
use MIME::Base64 qw(decode_base64);
use List::Util qw(first);
use constant _DYNAMIC_PREFERENCE_PREFIX => '__';
@ -1481,6 +1482,13 @@ sub create_preference_form {
}
}
}
} elsif ($c->stash->{preference_meta}->data_type eq 'enum') {
if ($c->stash->{preference}->first) {
$preselected_value = $c->stash->{preference}->first->value unless ($c->stash->{preference_meta}->data_type eq 'blob');
} else {
my $default_val = first { $_->default_val == 1 } @{ $enums };
$preselected_value = $default_val ? $default_val->value : undef;
}
} elsif ($c->stash->{preference_meta}->max_occur == 1) {
if ($c->stash->{preference}->first) {
$preselected_value = $c->stash->{preference}->first->value unless ($c->stash->{preference_meta}->data_type eq 'blob');

32
share/templates/helpers/pref_table.tt
Unescape View File

@ -64,63 +64,63 @@
</td>
<td>
[% IF r.attribute == "rewrite_rule_set" -%]
<select disabled="disabled">
<select autocomplete="off" disabled="disabled">
<option>&nbsp;</option>
[% FOR set IN helper.rewrite_rule_sets -%]
<option [% (r.rwrs_id.defined && r.rwrs_id == set.id) ? 'selected="selected"' : '' %]>[% set.name | html %]</option>
[% END -%]
</select>
[% ELSIF r.attribute == "cdr_export_sclidui_rwrs" -%]
<select disabled="disabled">
<select autocomplete="off" disabled="disabled">
<option>&nbsp;</option>
[% FOR set IN helper.rewrite_rule_sets -%]
<option [% (r.rwrs_id.defined && r.rwrs_id == set.id) ? 'selected="selected"' : '' %]>[% set.name | html %]</option>
[% END -%]
</select>
[% ELSIF r.attribute == "header_rule_set" -%]
<select disabled="disabled">
<select autocomplete="off" disabled="disabled">
<option>&nbsp;</option>
[% FOR set IN helper.header_rule_sets -%]
<option [% (r.value == set.id) ? 'selected="selected"' : '' %]>[% set.name | html %]</option>
[% END -%]
</select>
[% ELSIF r.attribute == "ncos" -%]
<select disabled="disabled">
<select autocomplete="off" disabled="disabled">
<option>&nbsp;</option>
[% FOR level IN helper.ncos_levels -%]
<option [% (r.ncos_id.defined && r.ncos_id == level.id) ? 'selected="selected"' : '' %]>[% level.level | html %]</option>
[% END -%]
</select>
[% ELSIF r.attribute == "adm_ncos" -%]
<select disabled="disabled">
<select autocomplete="off" disabled="disabled">
<option>&nbsp;</option>
[% FOR level IN helper.ncos_levels -%]
<option [% (r.adm_ncos_id.defined && r.adm_ncos_id == level.id) ? 'selected="selected"' : '' %]>[% level.level | html %]</option>
[% END -%]
</select>
[% ELSIF r.attribute == "adm_cf_ncos" -%]
<select disabled="disabled">
<select autocomplete="off" disabled="disabled">
<option>&nbsp;</option>
[% FOR level IN helper.ncos_levels -%]
<option [% (r.adm_cf_ncos_id.defined && r.adm_cf_ncos_id == level.id) ? 'selected="selected"' : '' %]>[% level.level | html %]</option>
[% END -%]
</select>
[% ELSIF r.attribute == "emergency_mapping_container" -%]
<select disabled="disabled">
<select autocomplete="off" disabled="disabled">
<option>&nbsp;</option>
[% FOR container IN helper.emergency_mapping_containers -%]
<option [% (r.emergency_mapping_container_id.defined && r.emergency_mapping_container_id == container.id) ? 'selected="selected"' : '' %]>[% container.name | html %]</option>
[% END -%]
</select>
[% ELSIF r.attribute == "sound_set" -%]
<select disabled="disabled">
<select autocomplete="off" disabled="disabled">
<option>&nbsp;</option>
[% FOR set IN helper.sound_sets -%]
<option [% (r.value.defined && r.value == set.id) ? 'selected="selected"' : '' %]>[% set.name | html %]</option>
[% END -%]
</select>
[% ELSIF r.attribute == "contract_sound_set" -%]
<select disabled="disabled">
<select autocomplete="off" disabled="disabled">
<option>&nbsp;</option>
[% FOR set IN helper.contract_sound_sets -%]
<option [% (r.value.defined && r.value == set.id) ? 'selected="selected"' : '' %]>[% set.name | html %]</option>
@ -136,7 +136,7 @@
[% END -%]
[% ELSIF r.data_type == "boolean" %]
<input type="checkbox" disabled="disabled"
<input type="checkbox" autocomplete="off" disabled="disabled"
[% IF r.value %]checked="checked"[% END %]/>
[% ELSIF r.data_type == "string" || r.data_type == "int" || r.data_type == "blob" %]
[% IF r.max_occur == 1 %]
@ -152,9 +152,9 @@
[% END %]
[% END %]
[% ELSIF r.data_type == "enum" %]
<select disabled="disabled">
<select autocomplete="off" disabled="disabled">
[% FOREACH e IN r.enums %]
<option [% IF r.value == e.value || (!r.value.defined && ! e.value.defined) %]selected="selected"[% END %]>[% e.label | html %]</option>
<option [% IF r.value == e.value || (!r.value.defined && e.default_val == 1) || (!r.value.defined && !e.value.defined) %]selected="selected"[% END %]>[% e.label | html %]</option>
[% END %]
</select>
[% END %]
@ -208,7 +208,7 @@
<div class="modal-body">
[% FOREACH net IN helper.aip_grp_rs.all %]
<div class="row-fluid">
<input type="text" value="[% net.ipnet %]" disabled="disabled"></input>
<input type="text" value="[% net.ipnet %]" autocomplete="off" disabled="disabled"></input>
<a class="btn btn-primary pull-right" href="?delete_aig=[% net.id %]"><i class="icon-trash"></i></a>
</div>
[% END %]
@ -221,7 +221,7 @@
<div class="modal-body">
[% FOREACH net IN helper.man_aip_grp_rs.all %]
<div class="row-fluid">
<input type="text" value="[% net.ipnet %]" disabled="disabled"></input>
<input type="text" value="[% net.ipnet %]" autocomplete="off" disabled="disabled"></input>
<a class="btn btn-primary pull-right" href="?delete_man_aig=[% net.id %]"><i class="icon-trash"></i></a>
</div>
[% END %]
@ -235,9 +235,9 @@
[% FOREACH v IN helper.preference_values %]
<div class="row-fluid">
[% IF v.disabled %]
<input type="text" value="[% v.value %]" disabled="disabled" class="ngcp-entry-disabled"/>
<input type="text" value="[% v.value %]" autocomplete="off" disabled="disabled" class="ngcp-entry-disabled"/>
[% ELSE %]
<input type="text" value="[% v.value %]" disabled="disabled"/>
<input type="text" value="[% v.value %]" autocomplete="off" disabled="disabled"/>
[% END %]
<a class="btn btn-primary pull-right" href="?delete=[% v.id %]"><i class="icon-trash"></i></a>
[% IF v.disabled %]

Write Preview
Loading…
Cancel
Save