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

MT#17413 simplify and fix preference edit modal

Browse Source 
newly added array_values were not immedeately available

Change-Id: Ib3a1f91a6b1a782c5ef0d36732b3bef394a74275
changes/87/5587/6
Gerhard Jungwirth 10 years ago
parent 9c1e781588
commit b037f148fd
6 changed files with 34 additions and 36 deletions
Show Stats Download Patch File Download Diff File

2
lib/NGCP/Panel/Controller/Customer.pm
Unescape View File

@ -2163,9 +2163,7 @@ sub preferences_base :Chained('base') :PathPart('preferences') :CaptureArgs(1) {
contract_id => $c->stash->{contract}->id,
location_id => $c->stash->{location}{id} || undef,
});
my @values = $c->stash->{preference}->get_column("value")->all;
$c->stash->{pref_id} = $pref_id;
$c->stash->{preference_values} = \@values;
$c->stash(template => 'customer/preferences.tt');
}

2
lib/NGCP/Panel/Controller/Domain.pm
Unescape View File

@ -324,8 +324,6 @@ sub preferences_base :Chained('base') :PathPart('preferences') :CaptureArgs(1) {
attribute_id => $pref_id,
domain_id => $provisioning_domain_id,
});
my @values = $c->stash->{preference}->get_column("value")->all;
$c->stash->{preference_values} = \@values;
$c->stash(template => 'domain/preferences.tt');
}

2
lib/NGCP/Panel/Controller/Peering.pm
Unescape View File

@ -522,8 +522,6 @@ sub servers_preferences_base :Chained('servers_preferences_list') :PathPart('')
},{
prefetch => 'peer_host',
});
my @values = $c->stash->{preference}->get_column("value")->all;
$c->stash->{preference_values} = \@values;
return;
}

2
lib/NGCP/Panel/Controller/SubscriberProfile.pm
Unescape View File

@ -699,8 +699,6 @@ sub preferences_base :Chained('profile_base') :PathPart('preferences') :CaptureA
attribute_id => $pref_id,
profile_id => $profile->id,
});
my @values = $c->stash->{preference}->get_column("value")->all;
$c->stash->{preference_values} = \@values;
$c->stash(template => 'subprofile/preferences.tt');
}

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

@ -200,10 +200,6 @@ sub create_preference_form {
}
}
$c->stash->{preference_values} = [
$c->stash->{preference}->get_column("value")->all
];
my $preselected_value = undef;
if ($c->stash->{preference_meta}->attribute eq "rewrite_rule_set") {
my $rewrite_caller_in_dpid = $pref_rs->search({
@ -299,18 +295,10 @@ sub create_preference_form {
}
}
}
} elsif($c->stash->{subscriber} &&
($c->stash->{preference_meta}->attribute eq "block_in_list" || $c->stash->{preference_meta}->attribute eq "block_out_list")) {
foreach my $v(@{ $c->stash->{preference_values} }) {
$v =~ s/^\#//;
if($c->user->roles eq "subscriberadmin" || $c->user->roles eq "subscriber") {
$v = NGCP::Panel::Utils::Subscriber::apply_rewrite(
c => $c, subscriber => $c->stash->{subscriber}, number => $v, direction => 'caller_out'
);
}
}
} elsif ($c->stash->{preference_meta}->max_occur == 1) {
$preselected_value = $c->stash->{preference_values}->[0];
if ($c->stash->{preference}->first) {
$preselected_value = $c->stash->{preference}->first->value;
}
}
my $form = NGCP::Panel::Form::Preferences->new({
@ -520,7 +508,6 @@ sub create_preference_form {
$v .= $suffix;
}
push @{ $c->stash->{preference_values} }, $v;
}
try {
$pref_rs->create({
@ -728,11 +715,33 @@ sub create_preference_form {
}
OUT:
my $preference_values = [];
foreach my $p ( $c->stash->{preference}->all ) {
my $v = $p->value;
$v =~ s/^\#//;
if( ($c->user->roles eq "subscriberadmin" || $c->user->roles eq "subscriber") &&
$c->stash->{subscriber} &&
( $c->stash->{preference_meta}->attribute eq "block_in_list" ||
$c->stash->{preference_meta}->attribute eq "block_out_list" )
) {
$v = NGCP::Panel::Utils::Subscriber::apply_rewrite(
c => $c, subscriber => $c->stash->{subscriber}, number => $v, direction => 'caller_out',
);
}
push @{ $preference_values }, {
id => $p->id,
value => $v,
disabled => !!($p->value =~ m/^\#/),
};
}
$form->process if ($posted && $form->validated);
$c->stash(form => $form,
aip_grp_rs => $aip_grp_rs,
man_aip_grp_rs => $man_aip_grp_rs);
$c->stash(form => $form,
aip_grp_rs => $aip_grp_rs,
man_aip_grp_rs => $man_aip_grp_rs,
preference_values => $preference_values);
return 1;
}

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

@ -192,23 +192,20 @@
</div>
[% ELSIF helper.preference_meta.max_occur != 1 %]
<div class="modal-body">
[% i = 0 -%]
[% FOREACH v IN helper.preference.all %]
[% val = helper.preference_values.$i -%]
[% FOREACH v IN helper.preference_values %]
<div class="row-fluid">
[% IF v.value.substr(0,1) == '#' %]
<input type="text" value="[% val %]" disabled="disabled" class="ngcp-entry-disabled"/>
[% IF v.disabled %]
<input type="text" value="[% v.value %]" disabled="disabled" class="ngcp-entry-disabled"/>
[% ELSE %]
<input type="text" value="[% val %]" disabled="disabled"/>
<input type="text" value="[% v.value %]" disabled="disabled"/>
[% END %]
<a class="btn btn-primary pull-right" href="?delete=[% v.id %]"><i class="icon-trash"></i></a>
[% IF v.value.substr(0,1) == '#' %]
[% IF v.disabled %]
<a class="btn btn-primary pull-right" style="margin:0 5px 0 5px" href="?activate=[% v.id %]"><i class="icon-ok"></i></a>
[% ELSE %]
<a class="btn btn-primary pull-right" style="margin:0 5px 0 5px" href="?deactivate=[% v.id %]"><i class="icon-ban-circle"></i></a>
[% END %]
</div>
[% i = i + 1 -%]
[% END %]
<form action="[% helper.form.action %]" method="post">
[% helper.form.field(helper.preference_meta.attribute).render %]

Write Preview
Loading…
Cancel
Save