MT#16983 Don't display pbxgroups and subscribers if there is no linked

Change-Id: Ic7070f6ca7614cabaa455d70399908f608d9a82f
changes/66/4266/2
Irina Peshinskaya 10 years ago
parent 75045e1eb8
commit bbfe673f4f

@ -298,7 +298,7 @@ sub base :Chained('sub_list') :PathPart('') :CaptureArgs(1) {
c => $c,
schema => $c->model('DB'),
subscriber => $c->stash->{subscriber} ,
);
) // [] ;
}
}
@ -2644,28 +2644,29 @@ sub order_pbx_items :Chained('master') :PathPart('orderpbxitems') :Args(0) :Does
my $subscriber = $c->stash->{subscriber};
my $prov_subscriber = $subscriber->provisioning_voip_subscriber;
my $items = $c->stash->{subscriber_pbx_items};
if(defined $move_id){
for( my $i=0; $i <= $#$items; $i++ ){
if($move_id == $items->[$i]->id){
my $i_subling = $i + ( ( $direction eq 'up' ) ? -1 : 1 );
@{$items}[$i,$i_subling] = @{$items}[$i_subling,$i];
last;
my $items = $c->stash->{subscriber_pbx_items} // [] ;
if(@$items){
if(defined $move_id){
for( my $i=0; $i <= $#$items; $i++ ){
if($move_id == $items->[$i]->id){
my $i_subling = $i + ( ( $direction eq 'up' ) ? -1 : 1 );
@{$items}[$i,$i_subling] = @{$items}[$i_subling,$i];
last;
}
}
NGCP::Panel::Utils::Subscriber::manage_pbx_groups(
c => $c,
schema => $c->model('DB'),
subscriber => $subscriber,
( $prov_subscriber->is_pbx_group ? 'groupmembers' : 'groups' ) => $items,
);
}
NGCP::Panel::Utils::Subscriber::manage_pbx_groups(
$c->stash->{subscriber_pbx_items} = NGCP::Panel::Utils::Subscriber::get_subscriber_pbx_items(
c => $c,
schema => $c->model('DB'),
subscriber => $subscriber,
( $prov_subscriber->is_pbx_group ? 'groupmembers' : 'groups' ) => $items,
subscriber => $subscriber ,
);
}
$c->stash->{subscriber_pbx_items} = NGCP::Panel::Utils::Subscriber::get_subscriber_pbx_items(
c => $c,
schema => $c->model('DB'),
subscriber => $subscriber ,
);
$c->stash->{template} = 'subscriber/pbx_group_items.tt';
$c->detach( $c->view('TT') );
}

@ -439,14 +439,17 @@ sub get_subscriber_pbx_items{
my $prov_subscriber = $subscriber->provisioning_voip_subscriber;
my $items_are_groups = !($prov_subscriber->is_pbx_group);
my $ids = get_subscriber_pbx_items_ids(@_);
my $items = get_pbx_subscribers_by_ids(
c => $c,
schema => $schema,
customer_id => $subscriber->contract->id ,
is_group => $items_are_groups,
ids => $ids,
);
my $ids = get_subscriber_pbx_items_ids(@_) // [];
my $items = [];
if(@$ids){
$items = get_pbx_subscribers_by_ids(
c => $c,
schema => $schema,
customer_id => $subscriber->contract->id ,
is_group => $items_are_groups,
ids => $ids,
);
}
return wantarray ? ($items, $ids) : $items;
}

Loading…
Cancel
Save