TT#55459 fix header_rule_set preference UI filtering

* header_rule_set preference on the UI is now
      excludes ones containing subscriber_id

Change-Id: Icdcbab7cba7d23acb8e55c842b3c7b2d9774dd55
changes/18/28718/2
Kirill Solomko 7 years ago
parent 376e3e80c1
commit 6a7f65ad2a

@ -398,8 +398,10 @@ sub load_preference_list :Private {
->resultset('voip_rewrite_rule_sets')
->search_rs({ reseller_id => $correct_reseller_id, });
my $header_rule_sets_rs = $c->model('DB')
->resultset('voip_header_rule_sets')
->search_rs({ reseller_id => $correct_reseller_id, });
->resultset('voip_header_rule_sets')->search_rs({
reseller_id => $correct_reseller_id,
subscriber_id => undef,
});
$c->stash(rwr_sets_rs => $rewrite_rule_sets_rs,
rwr_sets => [$rewrite_rule_sets_rs->all],
hdr_sets_rs => $header_rule_sets_rs,

@ -512,7 +512,9 @@ sub servers_preferences_list :Chained('servers_base') :PathPart('preferences') :
my $rewrite_rule_sets_rs = $c->model('DB')
->resultset('voip_rewrite_rule_sets');
my $header_rule_sets_rs = $c->model('DB')
->resultset('voip_header_rule_sets');
->resultset('voip_header_rule_sets')->search({
subscriber_id => undef
});
$c->stash(rwr_sets_rs => $rewrite_rule_sets_rs,
rwr_sets => [$rewrite_rule_sets_rs->all],
hdr_sets_rs => $header_rule_sets_rs,

@ -2506,7 +2506,10 @@ sub load_preference_list :Private {
my $rewrite_rule_sets_rs = $c->model('DB')
->resultset('voip_rewrite_rule_sets')->search({ reseller_id => $reseller_id });
my $header_rule_sets_rs = $c->model('DB')
->resultset('voip_header_rule_sets')->search({ reseller_id => $reseller_id });
->resultset('voip_header_rule_sets')->search({
reseller_id => $reseller_id,
subscriber_id => undef,
});
$c->stash(rwr_sets_rs => $rewrite_rule_sets_rs,
rwr_sets => [$rewrite_rule_sets_rs->all],
hdr_sets_rs => $header_rule_sets_rs,

@ -136,11 +136,11 @@ sub update_fields {
my $c = $self->ctx;
return unless $c;
return unless $c->stash->{set_result};
return unless $c->stash->{hm_set_result};
#if ($c->stash->{create_flag} || $c->stash->{edit_flag}) {
my $rwr_rs = $c->model('DB')->resultset('voip_rewrite_rule_sets')->search({
reseller_id => $c->stash->{set_result}->reseller_id,
reseller_id => $c->stash->{hm_set_result}->reseller_id,
});
# my $condition = $c->stash->{condition_result};

@ -175,10 +175,10 @@ sub options_rwr_set {
my $c = $self->ctx;
return unless $c;
return unless $c->stash->{set_result};
return unless $c->stash->{hm_set_result};
my $rwr_rs = $c->model('DB')->resultset('voip_rewrite_rule_sets')->search({
reseller_id => $c->stash->{set_result}->reseller_id,
reseller_id => $c->stash->{hm_set_result}->reseller_id,
});
$field->options([

Loading…
Cancel
Save