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

MT#16855 UNION ALL for panel UI call lists

Browse Source 
+dashboard uses a similar query for the survey
 info visible to subscribers,  which should now
 load faster as well.
+the filter dropdown select+update table was
 generally not working properly (MT#17323):
 -fnFilter() does net necesarily trigger new
  ajax requests, but searches in clientside
  table store. the list stays empty, if there
  is no direction column present, to match
  "in" or "out" literals.
 -using sSearch for specifying in/out filter
  disallows to enter other search params in
  text search field.
+union all now also used for the api
 subscriber_id filter

Change-Id: Ia777504b9ade7acb34c66cb899f366ce029c905f
changes/44/4144/8
Rene Krenn 10 years ago
parent bbfe673f4f
commit 58a55b9855
8 changed files with 245 additions and 188 deletions
Show Stats Download Patch File Download Diff File

33
lib/NGCP/Panel/Controller/API/CallLists.pm
Unescape View File

@ -21,7 +21,7 @@ require Catalyst::ActionRole::RequireSSL;
class_has 'api_description' => (
is => 'ro',
isa => 'Str',
default =>
default =>
'Defines call lists in simplified form for showing call histories of subscribers.',
);
@ -32,18 +32,19 @@ class_has 'query_params' => (
{
param => 'subscriber_id',
description => 'Filter for calls for a specific subscriber. Either this or customer_id is mandatory if called by admin, reseller or subscriberadmin to filter list down to a specific subscriber in order to properly determine the direction of calls.',
query => {
first => sub {
my $q = shift;
return {
'subscriber.id' => $q,
};
},
second => sub {
return {
join => 'subscriber',
};
},
new_rs => sub {
my ($c,$q,$rs) = @_;
my $subscriber = $c->model('DB')->resultset('voip_subscribers')->find($q);
if ($subscriber) {
my $out_rs = $rs->search_rs({
source_user_id => $subscriber->uuid,
});
my $in_rs = $rs->search_rs({
destination_user_id => $subscriber->uuid,
});
return $out_rs->union_all($in_rs);
}
return $rs;
},
},
{
@ -55,7 +56,7 @@ class_has 'query_params' => (
return {
-or => [
'source_account_id' => $q,
'destination_account_id' => $q,
'destination_account_id' => $q,
],
};
},
@ -245,7 +246,7 @@ sub GET :Allow {
(my $total_count, $items) = $self->paginate_order_collection($c, $items);
my (@embedded, @links);
my $form = $self->get_form($c);
my $href_data = $owner->{subscriber} ?
my $href_data = $owner->{subscriber} ?
"subscriber_id=".$owner->{subscriber}->id :
"customer_id=".$owner->{customer}->id;
for my $item ($items->all) {
@ -278,7 +279,7 @@ sub GET :Allow {
$hal->resource({
total_count => $total_count,
});
my $response = HTTP::Response->new(HTTP_OK, undef,
my $response = HTTP::Response->new(HTTP_OK, undef,
HTTP::Headers->new($hal->http_headers(skip_links => 1)), $hal->as_json);
$c->response->headers($response->headers);
$c->response->body($response->content);

29
lib/NGCP/Panel/Controller/API/Calls.pm
Unescape View File

@ -21,7 +21,7 @@ require Catalyst::ActionRole::RequireSSL;
class_has 'api_description' => (
is => 'ro',
isa => 'Str',
default =>
default =>
'Defines calls placed or received by a customer.',
);
@ -48,18 +48,19 @@ class_has 'query_params' => (
{
param => 'subscriber_id',
description => 'Filter for calls of a specific subscriber',
query => {
first => sub {
my $q = shift;
return {
'subscriber.id' => $q,
};
},
second => sub {
return {
join => 'subscriber',
};
},
new_rs => sub {
my ($c,$q,$rs) = @_;
my $subscriber = $c->model('DB')->resultset('voip_subscribers')->find($q);
if ($subscriber) {
my $out_rs = $rs->search_rs({
source_user_id => $subscriber->uuid,
});
my $in_rs = $rs->search_rs({
destination_user_id => $subscriber->uuid,
});
return $out_rs->union_all($in_rs);
}
return $rs;
},
},
]},
@ -131,7 +132,7 @@ sub GET :Allow {
$hal->resource({
total_count => $total_count,
});
my $response = HTTP::Response->new(HTTP_OK, undef,
my $response = HTTP::Response->new(HTTP_OK, undef,
HTTP::Headers->new($hal->http_headers(skip_links => 1)), $hal->as_json);
$c->response->headers($response->headers);
$c->response->body($response->content);

282
lib/NGCP/Panel/Controller/Subscriber.pm
Unescape View File

@ -385,15 +385,15 @@ sub webfax_ajax :Chained('base') :PathPart('webfax/ajax') :Args(0) {
join => 'subscriber',#kamailio.subscriber is meant here
});
NGCP::Panel::Utils::Datatables::process($c, $fax_rs, $c->stash->{fax_dt_columns},
NGCP::Panel::Utils::Datatables::process($c, $fax_rs, $c->stash->{fax_dt_columns},
sub {
my ($result) = @_;
my %data = ();
my $destination = {destination => $result->peer_number};
$data{peer_number} = NGCP::Panel::Utils::Subscriber::destination_as_string(
$c,
$destination,
$subscriber,
$c,
$destination,
$subscriber,
('in' eq $result->direction) ? 'caller_in' : 'callee_out'
);
return %data;
@ -762,8 +762,8 @@ sub preferences :Chained('base') :PathPart('preferences') :Args(0) {
$c->stash->{pref_groups} = \@newprefgroups;
my $special_prefs = { check => 1 };
foreach my $pref(qw/cfu cft cfna cfb
speed_dial reminder auto_attendant
foreach my $pref(qw/cfu cft cfna cfb
speed_dial reminder auto_attendant
voice_mail fax_server/) {
my $preference = $c->model('DB')->resultset('voip_preferences')->find({
attribute => $pref,
@ -857,8 +857,8 @@ sub preferences_edit :Chained('preferences_base') :PathPart('edit') :Args(0) {
log => "Failed to handle preference: $e",
desc => $c->loc('Failed to handle preference'),
);
NGCP::Panel::Utils::Navigation::back_or($c,
NGCP::Panel::Utils::Navigation::back_or($c,
$c->uri_for_action('/subscriber/preferences', [$c->req->captures->[0]]));
return;
}
@ -870,12 +870,12 @@ sub preferences_edit :Chained('preferences_base') :PathPart('edit') :Args(0) {
unless(is_deeply($old_auth_prefs, $new_auth_prefs)) {
try {
if(!NGCP::Panel::Utils::Preferences::is_peer_auth_active($c, $old_auth_prefs) &&
if(!NGCP::Panel::Utils::Preferences::is_peer_auth_active($c, $old_auth_prefs) &&
NGCP::Panel::Utils::Preferences::is_peer_auth_active($c, $new_auth_prefs)) {
NGCP::Panel::Utils::Sems::create_peer_registration(
$c, $prov_subscriber, $new_auth_prefs);
} elsif(NGCP::Panel::Utils::Preferences::is_peer_auth_active($c, $old_auth_prefs) &&
} elsif(NGCP::Panel::Utils::Preferences::is_peer_auth_active($c, $old_auth_prefs) &&
!NGCP::Panel::Utils::Preferences::is_peer_auth_active($c, $new_auth_prefs)) {
NGCP::Panel::Utils::Sems::delete_peer_registration(
@ -928,7 +928,7 @@ sub preferences_callforward :Chained('base') :PathPart('preferences/callforward'
log => "Invalid call-forward type '$cf_type'",
desc => $c->loc('Invalid Call Forward type.'),
);
NGCP::Panel::Utils::Navigation::back_or($c,
NGCP::Panel::Utils::Navigation::back_or($c,
$c->uri_for_action('/subscriber/preferences', [$c->req->captures->[0]]));
} # SWITCH
@ -946,13 +946,13 @@ sub preferences_callforward :Chained('base') :PathPart('preferences/callforward'
# there is more than one mapping,
# which can only be handled in advanced mode
$c->response->redirect(
$c->uri_for_action('/subscriber/preferences_callforward_advanced',
$c->response->redirect(
$c->uri_for_action('/subscriber/preferences_callforward_advanced',
[$c->req->captures->[0]], $cf_type, 'advanced'
)
);
return;
} elsif($cf_mapping->first && $cf_mapping->first->destination_set &&
} elsif($cf_mapping->first && $cf_mapping->first->destination_set &&
$cf_mapping->first->destination_set->voip_cf_destinations->first) {
# there are more than one destinations or a time set, so
@ -960,8 +960,8 @@ sub preferences_callforward :Chained('base') :PathPart('preferences/callforward'
if($cf_mapping->first->destination_set->voip_cf_destinations->count > 1 ||
$cf_mapping->first->time_set) {
$c->response->redirect(
$c->uri_for_action('/subscriber/preferences_callforward_advanced',
$c->response->redirect(
$c->uri_for_action('/subscriber/preferences_callforward_advanced',
[$c->req->captures->[0]], $cf_type, 'advanced'
)
);
@ -974,8 +974,8 @@ sub preferences_callforward :Chained('base') :PathPart('preferences/callforward'
if($posted) {
# TODO: normalize
$params = $c->request->params;
if(length($params->{destination}) &&
(!$c->request->params->{submitid} ||
if(length($params->{destination}) &&
(!$c->request->params->{submitid} ||
$c->request->params->{submitid} eq "cf_actions.save")
) {
if($params->{destination} !~ /\@/) {
@ -1038,8 +1038,8 @@ sub preferences_callforward :Chained('base') :PathPart('preferences/callforward'
NGCP::Panel::Utils::Navigation::check_form_buttons(
c => $c, form => $cf_form,
fields => {
'cf_actions.advanced' =>
$c->uri_for_action('/subscriber/preferences_callforward_advanced',
'cf_actions.advanced' =>
$c->uri_for_action('/subscriber/preferences_callforward_advanced',
[$c->req->captures->[0]], $cf_type, 'advanced'
),
},
@ -1113,7 +1113,7 @@ sub preferences_callforward :Chained('base') :PathPart('preferences/callforward'
$cf_preference->create({ value => $map->id });
if($cf_type eq 'cft') {
if($ringtimeout_preference->first) {
$ringtimeout_preference->first->update({
$ringtimeout_preference->first->update({
value => $c->request->params->{ringtimeout}
});
} else {
@ -1134,8 +1134,8 @@ sub preferences_callforward :Chained('base') :PathPart('preferences/callforward'
desc => $c->loc('Failed to save Call Forward'),
);
}
NGCP::Panel::Utils::Navigation::back_or($c,
NGCP::Panel::Utils::Navigation::back_or($c,
$c->uri_for_action('/subscriber/preferences', [$c->req->captures->[0]]));
}
@ -1185,7 +1185,7 @@ sub preferences_callforward_advanced :Chained('base') :PathPart('preferences/cal
log => "Invalid call-forward type '$cf_type'",
desc => $c->loc('Invalid Call Forward type.'),
);
NGCP::Panel::Utils::Navigation::back_or($c,
NGCP::Panel::Utils::Navigation::back_or($c,
$c->uri_for_action('/subscriber/preferences', [$c->req->captures->[0]]));
} # SWITCH
@ -1216,8 +1216,8 @@ sub preferences_callforward_advanced :Chained('base') :PathPart('preferences/cal
time_set => $map->time_set ? $map->time_set->id : undef,
};
}
my $params = {
active_callforward => \@maps,
my $params = {
active_callforward => \@maps,
ringtimeout => $ringtimeout_preference->first ? $ringtimeout_preference->first->value : 15,
};
@ -1231,16 +1231,16 @@ sub preferences_callforward_advanced :Chained('base') :PathPart('preferences/cal
NGCP::Panel::Utils::Navigation::check_form_buttons(
c => $c, form => $cf_form,
fields => {
'cf_actions.simple' =>
$c->uri_for_action('/subscriber/preferences_callforward',
'cf_actions.simple' =>
$c->uri_for_action('/subscriber/preferences_callforward',
[$c->req->captures->[0], $cf_type],
),
'cf_actions.edit_destination_sets' =>
$c->uri_for_action('/subscriber/preferences_callforward_destinationset',
'cf_actions.edit_destination_sets' =>
$c->uri_for_action('/subscriber/preferences_callforward_destinationset',
[$c->req->captures->[0]], $cf_type,
),
'cf_actions.edit_time_sets' =>
$c->uri_for_action('/subscriber/preferences_callforward_timeset',
'cf_actions.edit_time_sets' =>
$c->uri_for_action('/subscriber/preferences_callforward_timeset',
[$c->req->captures->[0]], $cf_type,
),
},
@ -1260,7 +1260,7 @@ sub preferences_callforward_advanced :Chained('base') :PathPart('preferences/cal
}
$cf_preference->delete_all;
unless(@active) {
$ringtimeout_preference->first->delete
$ringtimeout_preference->first->delete
if($cf_type eq "cft" && $ringtimeout_preference->first);
NGCP::Panel::Utils::Message::info(
c => $c,
@ -1268,7 +1268,7 @@ sub preferences_callforward_advanced :Chained('base') :PathPart('preferences/cal
);
# we don't use back_or, as we might end up in the simple view again
$c->res->redirect(
$c->uri_for_action('/subscriber/preferences',
$c->uri_for_action('/subscriber/preferences',
[$c->req->captures->[0]]), 1
);
return;
@ -1459,8 +1459,8 @@ sub preferences_callforward_destinationset_create :Chained('base') :PathPart('pr
desc => $c->loc('Failed to create new destination set'),
);
}
NGCP::Panel::Utils::Navigation::back_or($c,
$c->uri_for_action('/subscriber/preferences_callforward_destinationset',
NGCP::Panel::Utils::Navigation::back_or($c,
$c->uri_for_action('/subscriber/preferences_callforward_destinationset',
[$c->req->captures->[0]], $cf_type)
);
}
@ -1492,7 +1492,7 @@ sub preferences_callforward_destinationset_base :Chained('base') :PathPart('pref
sub preferences_callforward_destinationset_edit :Chained('preferences_callforward_destinationset_base') :PathPart('edit') :Args(1) {
my ($self, $c, $cf_type) = @_;
my $fallback = $c->uri_for_action('/subscriber/preferences_callforward_destinationset',
my $fallback = $c->uri_for_action('/subscriber/preferences_callforward_destinationset',
[$c->req->captures->[0]], $cf_type);
my $posted = ($c->request->method eq 'POST');
@ -1563,7 +1563,7 @@ sub preferences_callforward_destinationset_edit :Chained('preferences_callforwar
foreach my $mapping($set->voip_cf_mappings->all) {
my $cf = $cf_preference->find({ value => $mapping->id });
$cf->delete if $cf;
$ringtimeout_preference->first->delete
$ringtimeout_preference->first->delete
if($cf_type eq "cft" && $ringtimeout_preference->first);
$mapping->delete;
NGCP::Panel::Utils::Subscriber::check_cf_ivr( # one event per affected mapping
@ -1677,7 +1677,7 @@ sub preferences_callforward_destinationset_delete :Chained('preferences_callforw
$cf->delete if $cf;
$map->delete;
}
if($cf_type eq "cft" &&
if($cf_type eq "cft" &&
$prov_subscriber->voip_cf_mappings->search_rs({ type => $cf_type})->count == 0) {
$ringtimeout_preference->first->delete;
}
@ -1700,7 +1700,7 @@ sub preferences_callforward_destinationset_delete :Chained('preferences_callforw
}
NGCP::Panel::Utils::Navigation::back_or($c,
$c->uri_for_action('/subscriber/preferences_callforward_destinationset',
$c->uri_for_action('/subscriber/preferences_callforward_destinationset',
[$c->req->captures->[0]], $cf_type)
);
}
@ -1806,7 +1806,7 @@ sub preferences_callforward_timeset_create :Chained('base') :PathPart('preferenc
);
}
NGCP::Panel::Utils::Navigation::back_or($c,
$c->uri_for_action('/subscriber/preferences_callforward_timeset',
$c->uri_for_action('/subscriber/preferences_callforward_timeset',
[$c->req->captures->[0]], $cf_type)
);
}
@ -1889,7 +1889,7 @@ sub preferences_callforward_timeset_edit :Chained('preferences_callforward_times
$set->delete;
NGCP::Panel::Utils::Navigation::back_or($c,
$c->uri_for_action('/subscriber/preferences_callforward_timeset',
$c->uri_for_action('/subscriber/preferences_callforward_timeset',
[$c->req->captures->[0]], $cf_type), 1
);
return;
@ -1933,7 +1933,7 @@ sub preferences_callforward_timeset_edit :Chained('preferences_callforward_times
);
}
NGCP::Panel::Utils::Navigation::back_or($c,
$c->uri_for_action('/subscriber/preferences_callforward_timeset',
$c->uri_for_action('/subscriber/preferences_callforward_timeset',
[$c->req->captures->[0]], $cf_type)
);
}
@ -1976,7 +1976,7 @@ sub preferences_callforward_timeset_delete :Chained('preferences_callforward_tim
}
NGCP::Panel::Utils::Navigation::back_or($c,
$c->uri_for_action('/subscriber/preferences_callforward_timeset',
$c->uri_for_action('/subscriber/preferences_callforward_timeset',
[$c->req->captures->[0]], $cf_type)
);
}
@ -2009,7 +2009,7 @@ sub preferences_callforward_delete :Chained('base') :PathPart('preferences/callf
);
}
NGCP::Panel::Utils::Navigation::back_or($c,
NGCP::Panel::Utils::Navigation::back_or($c,
$c->uri_for_action('/subscriber/preferences', [$c->req->captures->[0]]));
}
@ -2030,7 +2030,7 @@ sub underrun_catchup :Private {
);
$c->response->redirect($c->uri_for());
#return;
}
}
}
sub load_preference_list :Private {
@ -2039,7 +2039,7 @@ sub load_preference_list :Private {
my $reseller_id = $c->stash->{subscriber}->contract->contact->reseller_id;
$self->underrun_catchup($c);
my $usr_pref_values = $c->model('DB')
->resultset('voip_preferences')
->search({
@ -2066,15 +2066,15 @@ sub load_preference_list :Private {
ncos_levels => [$ncos_levels_rs->all]);
my $sound_sets_rs = $c->model('DB')
->resultset('voip_sound_sets')->search({
reseller_id => $reseller_id,
->resultset('voip_sound_sets')->search({
reseller_id => $reseller_id,
contract_id => undef });
$c->stash(sound_sets_rs => $sound_sets_rs,
sound_sets => [$sound_sets_rs->all]);
my $contract_sound_sets_rs = $c->model('DB')
->resultset('voip_sound_sets')->search({
reseller_id => $reseller_id,
->resultset('voip_sound_sets')->search({
reseller_id => $reseller_id,
contract_id => $c->stash->{subscriber}->contract_id });
$c->stash(contract_sound_sets_rs => $contract_sound_sets_rs,
contract_sound_sets => [$contract_sound_sets_rs->all]);
@ -2114,7 +2114,7 @@ sub master :Chained('base') :PathPart('details') :CaptureArgs(0) {
);
$self->underrun_catchup($c);
$c->stash->{prov_lock} = NGCP::Panel::Utils::Preferences::get_usr_preference_rs(
c => $c,
attribute => 'lock',
@ -2126,7 +2126,7 @@ sub details :Chained('master') :PathPart('') :Args(0) :Does(ACL) :ACLDetachTo('/
my ($self, $c) = @_;
$self->underrun_catchup($c);
$c->stash->{prov_lock} = NGCP::Panel::Utils::Preferences::get_usr_preference_rs(
c => $c,
attribute => 'lock',
@ -2202,7 +2202,7 @@ sub edit_master :Chained('master') :PathPart('edit') :Args(0) :Does(ACL) :ACLDet
my $form; my $pbx_ext; my $is_admin; my $subadmin_pbx;
my $base_number;
if($c->stash->{billing_mapping}->product->class eq "pbxaccount") {
$c->stash(customer_id => $subscriber->contract->id);
if($subscriber->provisioning_voip_subscriber->is_pbx_pilot) {
@ -2346,7 +2346,7 @@ sub edit_master :Chained('master') :PathPart('edit') :Args(0) :Does(ACL) :ACLDet
if($form->params->{display_name}) {
my $display_pref = NGCP::Panel::Utils::Preferences::get_usr_preference_rs(
c => $c, attribute => 'display_name',
c => $c, attribute => 'display_name',
prov_subscriber => $prov_subscriber);
if($display_pref->first) {
$display_pref->first->update({ value => $form->params->{display_name} });
@ -2356,7 +2356,7 @@ sub edit_master :Chained('master') :PathPart('edit') :Args(0) :Does(ACL) :ACLDet
}
if(defined $form->params->{pbx_extension}) {
my $pref = NGCP::Panel::Utils::Preferences::get_usr_preference_rs(
c => $c, attribute => 'cloud_pbx_ext',
c => $c, attribute => 'cloud_pbx_ext',
prov_subscriber => $prov_subscriber);
if($pref->first) {
$pref->first->update({ value => $form->params->{pbx_extension} });
@ -2375,7 +2375,7 @@ sub edit_master :Chained('master') :PathPart('edit') :Args(0) :Does(ACL) :ACLDet
reseller_id => $c->user->reseller_id,
});
}
$profile_set = $profile_set_rs->find($form->values->{profile_set}{id});
unless($profile_set) {
NGCP::Panel::Utils::Message::error(
@ -2453,7 +2453,7 @@ sub edit_master :Chained('master') :PathPart('edit') :Args(0) :Does(ACL) :ACLDet
type => $type, old => $old_profile, new => $prov_subscriber->profile_id
);
}
my $new_group_ids = defined $form->value->{group_select} ?
my $new_group_ids = defined $form->value->{group_select} ?
decode_json($form->value->{group_select}) : [];
NGCP::Panel::Utils::Subscriber::manage_pbx_groups(
c => $c,
@ -2499,7 +2499,7 @@ sub edit_master :Chained('master') :PathPart('edit') :Args(0) :Does(ACL) :ACLDet
}
if($subscriber->primary_number) {
my $old_number = {
my $old_number = {
cc => $subscriber->primary_number->cc,
ac => $subscriber->primary_number->ac,
sn => $subscriber->primary_number->sn,
@ -2524,18 +2524,18 @@ sub edit_master :Chained('master') :PathPart('edit') :Args(0) :Does(ACL) :ACLDet
$subscriber->discard_changes; # reload row because of potential new number
if(defined $subscriber->primary_number) {
my $new_number = {
my $new_number = {
cc => $subscriber->primary_number->cc,
ac => $subscriber->primary_number->ac,
sn => $subscriber->primary_number->sn,
};
if($subscriber->provisioning_voip_subscriber->admin &&
if($subscriber->provisioning_voip_subscriber->admin &&
!is_deeply($old_number, $new_number)) {
foreach my $sub($c->stash->{subscribers}->all, ( $c->stash->{pbx_groups} ? $c->stash->{pbx_groups}->all : () )) {
my $base_pref = NGCP::Panel::Utils::Preferences::get_usr_preference_rs(
c => $c, attribute => 'cloud_pbx_base_cli',
c => $c, attribute => 'cloud_pbx_base_cli',
prov_subscriber => $sub->provisioning_voip_subscriber);
my $val = $form->params->{e164}{cc} .
my $val = $form->params->{e164}{cc} .
($form->params->{e164}{ac} // '') .
$form->params->{e164}{sn};
if($base_pref->first) {
@ -2599,7 +2599,7 @@ sub edit_master :Chained('master') :PathPart('edit') :Args(0) :Does(ACL) :ACLDet
prov_subscriber => $subscriber->provisioning_voip_subscriber,
level => $form->values->{lock},
) if ($subscriber->provisioning_voip_subscriber);
#if($lock->first) {
# if ($form->values->{lock} == 0) {
# $lock->delete;
@ -2644,6 +2644,7 @@ 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(@$items){
if(defined $move_id){
@ -2690,7 +2691,7 @@ sub aliases_ajax :Chained('master') :PathPart('ordergroups') :Args(0) :Does(ACL)
]);
NGCP::Panel::Utils::Datatables::process($c, $num_rs, $alias_columns);
$c->detach( $c->view("JSON") );
}
@ -2771,7 +2772,7 @@ sub edit_voicebox :Chained('base') :PathPart('preferences/voicebox/edit') :Args(
log => "no voicemail user found for subscriber uuid ".$c->stash->{subscriber}->uuid,
desc => $c->loc('Failed to find voicemail user.'),
);
NGCP::Panel::Utils::Navigation::back_or($c,
NGCP::Panel::Utils::Navigation::back_or($c,
$c->uri_for_action('/subscriber/preferences', [$c->req->captures->[0]]));
}
my $params;
@ -2791,7 +2792,7 @@ sub edit_voicebox :Chained('base') :PathPart('preferences/voicebox/edit') :Args(
last SWITCH;
};
/^email$/ && do {
$form = NGCP::Panel::Form::Voicemail::Email->new;
$form = NGCP::Panel::Form::Voicemail::Email->new;
$params = { 'email' => $vm_user->email };
$form->process(params => $posted ? $c->req->params : $params);
NGCP::Panel::Utils::Navigation::check_form_buttons(
@ -2803,7 +2804,7 @@ sub edit_voicebox :Chained('base') :PathPart('preferences/voicebox/edit') :Args(
last SWITCH;
};
/^attach$/ && do {
$form = NGCP::Panel::Form::Voicemail::Attach->new;
$form = NGCP::Panel::Form::Voicemail::Attach->new;
$params = { 'attach' => $vm_user->attach eq 'yes' ? 1 : 0 };
$form->process(params => $posted ? $c->req->params : $params);
NGCP::Panel::Utils::Navigation::check_form_buttons(
@ -2815,14 +2816,14 @@ sub edit_voicebox :Chained('base') :PathPart('preferences/voicebox/edit') :Args(
last SWITCH;
};
/^delete$/ && do {
$form = NGCP::Panel::Form::Voicemail::Delete->new;
$form = NGCP::Panel::Form::Voicemail::Delete->new;
$params = { 'delete' => $vm_user->get_column('delete') eq 'yes' ? 1 : 0 };
$form->process(params => $posted ? $c->req->params : $params);
NGCP::Panel::Utils::Navigation::check_form_buttons(
c => $c, form => $form, fields => {}, back_uri => $c->req->uri,
);
if($posted && $form->validated) {
$vm_user->update({
$vm_user->update({
delete => $form->field('delete')->value ? 'yes' : 'no',
# force attach if delete flag is set, otherwise message will be lost
'attach' => $form->field('delete')->value ? 'yes' : $vm_user->attach,
@ -2836,7 +2837,7 @@ sub edit_voicebox :Chained('base') :PathPart('preferences/voicebox/edit') :Args(
log => "trying to set invalid voicemail param '$attribute' for subscriber uuid ".$c->stash->{subscriber}->uuid,
desc => $c->loc('Invalid voicemail setting'),
);
NGCP::Panel::Utils::Navigation::back_or($c,
NGCP::Panel::Utils::Navigation::back_or($c,
$c->uri_for_action('/subscriber/preferences', [$c->req->captures->[0]]), 1);
return;
} # SWITCH
@ -2845,7 +2846,7 @@ sub edit_voicebox :Chained('base') :PathPart('preferences/voicebox/edit') :Args(
c => $c,
desc => $c->loc('Successfully updated voicemail setting'),
);
NGCP::Panel::Utils::Navigation::back_or($c,
NGCP::Panel::Utils::Navigation::back_or($c,
$c->uri_for_action('/subscriber/preferences', [$c->req->captures->[0]]), 1);
return;
}
@ -2855,7 +2856,7 @@ sub edit_voicebox :Chained('base') :PathPart('preferences/voicebox/edit') :Args(
error => $e,
desc => $c->loc('Failed to update voicemail setting'),
);
NGCP::Panel::Utils::Navigation::back_or($c,
NGCP::Panel::Utils::Navigation::back_or($c,
$c->uri_for_action('/subscriber/preferences', [$c->req->captures->[0]]));
}
@ -2999,7 +3000,7 @@ sub edit_fax :Chained('base') :PathPart('preferences/fax/edit') :Args(1) {
c => $c,
desc => $c->loc('Successfully updated fax setting'),
);
NGCP::Panel::Utils::Navigation::back_or($c,
NGCP::Panel::Utils::Navigation::back_or($c,
$c->uri_for_action('/subscriber/preferences', [$c->req->captures->[0]]), 1);
return;
}
@ -3009,7 +3010,7 @@ sub edit_fax :Chained('base') :PathPart('preferences/fax/edit') :Args(1) {
error => $e,
desc => $c->loc('Failed to update fax setting'),
);
NGCP::Panel::Utils::Navigation::back_or($c,
NGCP::Panel::Utils::Navigation::back_or($c,
$c->uri_for_action('/subscriber/preferences', [$c->req->captures->[0]]));
}
@ -3030,7 +3031,7 @@ sub edit_reminder :Chained('base') :PathPart('preferences/reminder/edit') {
my $posted = ($c->request->method eq 'POST');
my $reminder = $c->stash->{subscriber}->provisioning_voip_subscriber->voip_reminder;
my $params = {};
if(!$posted && $reminder) {
$params = { 'time' => $reminder->column_time, recur => $reminder->recur};
}
@ -3078,7 +3079,7 @@ sub edit_reminder :Chained('base') :PathPart('preferences/reminder/edit') {
desc => $c->loc('Failed to update reminder setting.'),
);
}
NGCP::Panel::Utils::Navigation::back_or($c,
NGCP::Panel::Utils::Navigation::back_or($c,
$c->uri_for_action('/subscriber/preferences', [$c->req->captures->[0]]));
}
@ -3090,20 +3091,12 @@ sub edit_reminder :Chained('base') :PathPart('preferences/reminder/edit') {
);
}
sub ajax_calls :Chained('calllist_master') :PathPart('ajax') :Args(0) {
my ($self, $c) = @_;
# CDRs
my $rs = $c->model('DB')->resultset('cdr')->search({
-or => [
source_user_id => $c->stash->{subscriber}->uuid,
destination_user_id => $c->stash->{subscriber}->uuid,
],
});
sub _process_calls_rows {
my ($c,$rs) = @_;
my $owner = {
subscriber => $c->stash->{subscriber},
customer => $c->stash->{subscriber}->contract,
};
subscriber => $c->stash->{subscriber},
customer => $c->stash->{subscriber}->contract,
};
NGCP::Panel::Utils::Datatables::process(
$c, $rs, $c->stash->{calls_dt_columns},
sub {
@ -3120,19 +3113,66 @@ sub ajax_calls :Chained('calllist_master') :PathPart('ajax') :Args(0) {
$data{source_user} = uri_unescape($resource->{other_cli});
$data{destination_user} = uri_unescape($resource->{own_cli});
}
$data{customer_cost} = $resource->{customer_cost};
$data{duration} = (defined $result->duration ? sprintf("%.2f s", $result->duration) : "");
$data{total_customer_cost} = (defined $result->get_column('total_customer_cost') ? sprintf("%.2f", $result->get_column('total_customer_cost') / 100.0) : "");
return %data;
},
sub {
my ($result) = @_;
my %data = ();
$data{duration} = (defined $result->{duration} ? sprintf("%.2f s", $result->{duration}) : "");
$data{total_customer_cost} = (defined $result->{total_customer_cost} ? sprintf("%.2f", $result->{total_customer_cost} / 100.0) : "");
return %data;
},
);
}
sub ajax_calls :Chained('calllist_master') :PathPart('list/ajax') :Args(0) {
my ($self, $c) = @_;
my $out_rs = $c->model('DB')->resultset('cdr')->search({
source_user_id => $c->stash->{subscriber}->uuid,
});
my $in_rs = $c->model('DB')->resultset('cdr')->search({
destination_user_id => $c->stash->{subscriber}->uuid,
});
my $rs = $out_rs->union_all($in_rs);
_process_calls_rows($c,$rs);
$c->detach( $c->view("JSON") );
}
sub ajax_calls_in :Chained('calllist_master') :PathPart('list/ajax/in') :Args(0) {
my ($self, $c) = @_;
my $rs = $c->model('DB')->resultset('cdr')->search({
destination_user_id => $c->stash->{subscriber}->uuid,
});
_process_calls_rows($c,$rs);
$c->detach( $c->view("JSON") );
}
sub ajax_calls_out :Chained('calllist_master') :PathPart('list/ajax/out') :Args(0) {
my ($self, $c) = @_;
my $rs = $c->model('DB')->resultset('cdr')->search({
source_user_id => $c->stash->{subscriber}->uuid,
});
_process_calls_rows($c,$rs);
$c->detach( $c->view("JSON") );
}
sub ajax_call_details :Chained('master') :PathPart('calls/ajax') :Args(1) {
my ($self, $c, $call_id) = @_;
my $call = $c->model('DB')->resultset('cdr')->search_rs({
id => $call_id,
});
$c->stash(
$c->stash(
template => 'subscriber/call_details.tt',
call => { $call->first->get_inflated_columns } );
$c->detach( $c->view('TT') );
@ -3198,7 +3238,7 @@ sub voicemail :Chained('master') :PathPart('voicemail') :CaptureArgs(1) {
log => "no such voicemail file with id '$vm_id' for uuid ".$c->stash->{subscriber}->uuid,
desc => $c->loc('No such voicemail file.'),
);
NGCP::Panel::Utils::Navigation::back_or($c,
NGCP::Panel::Utils::Navigation::back_or($c,
$c->uri_for_action('/subscriber/details', [$c->req->captures->[0]]));
}
$c->stash->{voicemail} = $rs->first;
@ -3220,13 +3260,13 @@ sub play_voicemail :Chained('voicemail') :PathPart('play') :Args(0) {
error => $e,
desc => $c->loc('Transcode of audio file failed'),
);
NGCP::Panel::Utils::Navigation::back_or($c,
NGCP::Panel::Utils::Navigation::back_or($c,
$c->uri_for_action('/subscriber/details', [$c->req->captures->[0]]));
}
NGCP::Panel::Utils::Subscriber::mark_voicemail_read( 'c' => $c, 'voicemail' => $c->stash->{voicemail} );
NGCP::Panel::Utils::Subscriber::vmnotify( 'c' => $c, 'voicemail' => $c->stash->{voicemail} );
$c->response->header('Content-Disposition' => 'attachment; filename="'.$file->msgnum.'.wav"');
$c->response->content_type('audio/x-wav');
$c->response->body($data);
@ -3253,7 +3293,7 @@ sub delete_voicemail :Chained('voicemail') :PathPart('delete') :Args(0) {
);
}
NGCP::Panel::Utils::Subscriber::vmnotify( c => $c, voicemail => $c->stash->{voicemail} );
NGCP::Panel::Utils::Navigation::back_or($c,
NGCP::Panel::Utils::Navigation::back_or($c,
$c->uri_for_action('/subscriber/details', [$c->req->captures->[0]]));
}
@ -3277,7 +3317,7 @@ sub registered :Chained('master') :PathPart('registered') :CaptureArgs(1) {
log => "failed to find location id '$reg_id' for subscriber uuid " . $s->uuid,
desc => $c->loc('Failed to find registered device.'),
);
NGCP::Panel::Utils::Navigation::back_or($c,
NGCP::Panel::Utils::Navigation::back_or($c,
$c->uri_for_action('/subscriber/details', [$c->req->captures->[0]]));
}
}
@ -3291,8 +3331,8 @@ sub delete_registered :Chained('registered') :PathPart('delete') :Args(0) {
my $ret;
try {
NGCP::Panel::Utils::Kamailio::delete_location_contact($c,
$c->stash->{subscriber}->provisioning_voip_subscriber,
NGCP::Panel::Utils::Kamailio::delete_location_contact($c,
$c->stash->{subscriber}->provisioning_voip_subscriber,
$c->stash->{registered}->contact);
} catch($e) {
NGCP::Panel::Utils::Message::error(
@ -3307,7 +3347,7 @@ sub delete_registered :Chained('registered') :PathPart('delete') :Args(0) {
data => { $c->stash->{registered}->get_inflated_columns },
desc => $c->loc('Successfully deleted registered device'),
);
NGCP::Panel::Utils::Navigation::back_or($c,
NGCP::Panel::Utils::Navigation::back_or($c,
$c->uri_for_action('/subscriber/details', [$c->req->captures->[0]]));
}
@ -3331,8 +3371,8 @@ sub create_registered :Chained('master') :PathPart('registered/create') :Args(0)
);
if($posted && $form->validated) {
try {
NGCP::Panel::Utils::Kamailio::create_location($c,
$c->stash->{subscriber}->provisioning_voip_subscriber,
NGCP::Panel::Utils::Kamailio::create_location($c,
$c->stash->{subscriber}->provisioning_voip_subscriber,
$form->field('contact')->value,
$form->field('q')->value
);
@ -3347,7 +3387,7 @@ sub create_registered :Chained('master') :PathPart('registered/create') :Args(0)
desc => $c->loc('Failed to add registered device'),
);
}
NGCP::Panel::Utils::Navigation::back_or($c,
NGCP::Panel::Utils::Navigation::back_or($c,
$c->uri_for_action('/subscriber/details', [$c->req->captures->[0]]));
}
@ -3364,7 +3404,7 @@ sub create_trusted :Chained('base') :PathPart('preferences/trusted/create') :Arg
my $posted = ($c->request->method eq 'POST');
my $trusted_rs = $c->stash->{subscriber}->provisioning_voip_subscriber->voip_trusted_sources;
my $params = {};
my $form = NGCP::Panel::Form::Subscriber::TrustedSource->new;
$form->process(
posted => $posted,
@ -3396,7 +3436,7 @@ sub create_trusted :Chained('base') :PathPart('preferences/trusted/create') :Arg
desc => $c->loc('Failed to create trusted source'),
);
}
NGCP::Panel::Utils::Navigation::back_or($c,
NGCP::Panel::Utils::Navigation::back_or($c,
$c->uri_for_action('/subscriber/preferences', [$c->req->captures->[0]]));
}
@ -3420,7 +3460,7 @@ sub trusted_base :Chained('base') :PathPart('preferences/trusted') :CaptureArgs(
log => "trusted source id '$trusted_id' not found for subscriber uuid ".$c->stash->{subscriber}->uuid,
desc => $c->loc('Trusted source entry not found'),
);
NGCP::Panel::Utils::Navigation::back_or($c,
NGCP::Panel::Utils::Navigation::back_or($c,
$c->uri_for_action('/subscriber/preferences', [$c->req->captures->[0]]));
}
}
@ -3434,9 +3474,9 @@ sub edit_trusted :Chained('trusted_base') :PathPart('edit') {
my $posted = ($c->request->method eq 'POST');
my $trusted = $c->stash->{trusted};
my $params = {};
if(!$posted && $trusted) {
$params = {
$params = {
'src_ip' => $trusted->src_ip,
'protocol' => $trusted->protocol,
'from_pattern' => $trusted->from_pattern,
@ -3472,7 +3512,7 @@ sub edit_trusted :Chained('trusted_base') :PathPart('edit') {
desc => $c->loc('Failed to update trusted source'),
);
}
NGCP::Panel::Utils::Navigation::back_or($c,
NGCP::Panel::Utils::Navigation::back_or($c,
$c->uri_for_action('/subscriber/preferences', [$c->req->captures->[0]]));
}
@ -3505,7 +3545,7 @@ sub delete_trusted :Chained('trusted_base') :PathPart('delete') :Args(0) {
);
}
NGCP::Panel::Utils::Navigation::back_or($c,
NGCP::Panel::Utils::Navigation::back_or($c,
$c->uri_for_action('/subscriber/preferences', [$c->req->captures->[0]]));
}
@ -3584,7 +3624,7 @@ sub create_speeddial :Chained('base') :PathPart('preferences/speeddial/create')
desc => $c->loc('Failed to create speed dial slot'),
);
}
NGCP::Panel::Utils::Navigation::back_or($c,
NGCP::Panel::Utils::Navigation::back_or($c,
$c->uri_for_action('/subscriber/preferences', [$c->req->captures->[0]]));
}
@ -3608,7 +3648,7 @@ sub speeddial :Chained('base') :PathPart('preferences/speeddial') :CaptureArgs(1
log => "no such speed dial slot with id '$sd_id' for uuid ".$c->stash->{subscriber}->uuid,
desc => $c->loc('No such speed dial id.'),
);
NGCP::Panel::Utils::Navigation::back_or($c,
NGCP::Panel::Utils::Navigation::back_or($c,
$c->uri_for_action('/subscriber/preferences', [$c->req->captures->[0]]));
}
$c->stash->{speeddial} = $sd;
@ -3634,7 +3674,7 @@ sub delete_speeddial :Chained('speeddial') :PathPart('delete') :Args(0) {
desc => $c->loc('Failed to delete speed dial slot'),
);
}
NGCP::Panel::Utils::Navigation::back_or($c,
NGCP::Panel::Utils::Navigation::back_or($c,
$c->uri_for_action('/subscriber/preferences', [$c->req->captures->[0]]));
}
@ -3689,7 +3729,7 @@ sub edit_speeddial :Chained('speeddial') :PathPart('edit') :Args(0) {
desc => $c->loc('Failed to update speed dial slot'),
);
}
NGCP::Panel::Utils::Navigation::back_or($c,
NGCP::Panel::Utils::Navigation::back_or($c,
$c->uri_for_action('/subscriber/preferences', [$c->req->captures->[0]]));
}
@ -3723,7 +3763,7 @@ sub autoattendant :Chained('base') :PathPart('preferences/autoattendant') :Captu
log => "no such auto attendant slot with id '$aa_id' for uuid ".$c->stash->{subscriber}->uuid,
desc => $c->loc('No such auto attendant id.'),
);
NGCP::Panel::Utils::Navigation::back_or($c,
NGCP::Panel::Utils::Navigation::back_or($c,
$c->uri_for_action('/subscriber/preferences', [$c->req->captures->[0]]));
}
$c->stash->{autoattendant} = $aa;
@ -3749,7 +3789,7 @@ sub delete_autoattendant :Chained('autoattendant') :PathPart('delete') :Args(0)
desc => $c->loc('Failed to delete auto attendant slot'),
);
}
NGCP::Panel::Utils::Navigation::back_or($c,
NGCP::Panel::Utils::Navigation::back_or($c,
$c->uri_for_action('/subscriber/preferences', [$c->req->captures->[0]]));
}
@ -3815,7 +3855,7 @@ sub edit_autoattendant :Chained('base') :PathPart('preferences/speeddial/edit')
desc => $c->loc('Failed to update autoattendant slots'),
);
}
NGCP::Panel::Utils::Navigation::back_or($c,
NGCP::Panel::Utils::Navigation::back_or($c,
$c->uri_for_action('/subscriber/preferences', [$c->req->captures->[0]]));
}
@ -3849,7 +3889,7 @@ sub ccmappings :Chained('base') :PathPart('preferences/ccmappings') :CaptureArgs
log => "no such ccmapping with id '$aa_id' for uuid ".$c->stash->{subscriber}->uuid,
desc => $c->loc('No such auto ccmapping id.'),
);
NGCP::Panel::Utils::Navigation::back_or($c,
NGCP::Panel::Utils::Navigation::back_or($c,
$c->uri_for_action('/subscriber/preferences', [$c->req->captures->[0]]));
}
$c->stash->{ccmapping} = $ccmapping;
@ -3876,7 +3916,7 @@ sub delete_ccmapping :Chained('ccmappings') :PathPart('delete') :Args(0) {
desc => $c->loc('Failed to delete ccmapping'),
);
}
NGCP::Panel::Utils::Navigation::back_or($c,
NGCP::Panel::Utils::Navigation::back_or($c,
$c->uri_for_action('/subscriber/preferences', [$c->req->captures->[0]]));
return;
}
@ -3935,7 +3975,7 @@ sub edit_ccmapping :Chained('base') :PathPart('preferences/ccmappings/edit') :Ar
desc => $c->loc('Failed to update ccmappings'),
);
}
NGCP::Panel::Utils::Navigation::back_or($c,
NGCP::Panel::Utils::Navigation::back_or($c,
$c->uri_for_action('/subscriber/preferences', [$c->req->captures->[0]]));
}

44
lib/NGCP/Panel/Role/API.pm
Unescape View File

@ -137,9 +137,9 @@ sub validate_form {
# check keys/vals
$form->process(params => $resource, posted => 1, %{$form_params} );
unless($form->validated) {
my $e = join '; ', map {
my $e = join '; ', map {
my $in = (defined $_->input && ref $_->input eq 'HASH' && exists $_->input->{id}) ? $_->input->{id} : ($_->input // '');
sprintf 'field=\'%s\', input=\'%s\', errors=\'%s\'',
sprintf 'field=\'%s\', input=\'%s\', errors=\'%s\'',
($_->parent->$_isa('HTML::FormHandler::Field') ? $_->parent->name . '_' : '') . $_->name,
$in,
join('', @{ $_->errors })
@ -163,7 +163,7 @@ sub validate_form {
sub validate_fields {
my ($self, $c, $resource, $fields, $run) = @_;
for my $k (keys %{ $resource }) {
#if($resource->{$k}->$_isa('JSON::XS::Boolean') || $resource->{$k}->$_isa('JSON::PP::Boolean')) {
if($resource->{$k}->$_isa('JSON::PP::Boolean')) {
@ -207,7 +207,7 @@ sub error {
my ($self, $c, $code, $message) = @_;
$c->log->error("error $code - $message"); # TODO: user, trace etc
$c->response->content_type('application/json');
$c->response->status($code);
$c->response->body(JSON::to_json({ code => $code, message => $message })."\n");
@ -243,7 +243,7 @@ sub require_body {
my ($self, $c) = @_;
return 1 if length $c->stash->{body};
$self->error($c, HTTP_BAD_REQUEST, "This request is missing a message body.");
return;
@ -290,7 +290,7 @@ sub allowed_methods_filtered {
}
return \@methods;
} else {
return $self->allowed_methods;
return $self->allowed_methods;
}
}
@ -329,7 +329,7 @@ sub valid_id {
sub require_valid_patch {
my ($self, $c, $json, $ops) = @_;
my $valid_ops = {
my $valid_ops = {
'replace' => { 'path' => 1, 'value' => 1 },
'copy' => { 'from' => 1, 'path' => 1 },
'remove' => { 'path' => 1 },
@ -469,7 +469,7 @@ sub apply_patch {
} else {
die($pe); #->rethrow;
}
}
}
} elsif ('move' eq $_ or 'copy' eq $_) {
try {
$entity = $coderef->('JSON::Pointer', $entity, $op->{from}, $op->{path});
@ -482,7 +482,7 @@ sub apply_patch {
} else {
die($pe); #->rethrow;
}
}
}
} elsif ('test' eq $_) {
try {
die "test failed - path: $op->{path} value: $op->{value}\n"
@ -497,7 +497,7 @@ sub apply_patch {
} else {
die($pe); #->rethrow;
}
}
}
}
}
}
@ -523,7 +523,7 @@ sub apply_patch {
# }
# NGCP::Panel::Utils::DateTime::set_fake_time();
# $c->stash->{is_fake_time} = 0;
# $c->log('resetting faked system time: ' . NGCP::Panel::Utils::DateTime::to_string(NGCP::Panel::Utils::DateTime::current_local));
# $c->log('resetting faked system time: ' . NGCP::Panel::Utils::DateTime::to_string(NGCP::Panel::Utils::DateTime::current_local));
# }
#}
@ -535,7 +535,7 @@ sub apply_patch {
# $c->log('resetting faked system time: ' . NGCP::Panel::Utils::DateTime::to_string(NGCP::Panel::Utils::DateTime::current_local));
# }
#}
sub set_body {
my ($self, $c) = @_;
$c->stash->{body} = $c->request->body ? (do { local $/; $c->request->body->getline }) : '';
@ -583,16 +583,16 @@ around 'item_rs' => sub {
my ($orig, $self, @orig_params) = @_;
my $item_rs = $self->$orig(@orig_params);
return unless($item_rs);
if ($self->can('query_params')) {
return $self->apply_query_params($orig_params[0],$self->query_params,$item_rs);
}
return $item_rs;
};
sub apply_query_params {
my ($self,$c,$query_params,$item_rs) = @_;
# no query params defined in collection controller
unless(@{ $query_params }) {
@ -601,16 +601,22 @@ sub apply_query_params {
foreach my $param(keys %{ $c->req->query_params }) {
my @p = grep { $_->{param} eq $param } @{ $query_params };
next unless($p[0]->{query}); # skip "dummy" query parameters
next unless($p[0]->{query} || $p[0]->{new_rs}); # skip "dummy" query parameters
my $q = $c->req->query_params->{$param}; # TODO: arrayref?
$q =~ s/\*/\%/g;
$q = undef if $q eq "NULL"; # IS NULL translation
if(@p) {
$item_rs = $item_rs->search($p[0]->{query}->{first}($q,$c), $p[0]->{query}->{second}($q,$c));
if (defined $p[0]->{new_rs}) {
#compose fresh rs based on current, to support set operations with filters:
$item_rs = $p[0]->{new_rs}($c,$q,$item_rs);
} elsif (defined $p[0]->{query}) {
#regular chaining:
$item_rs = $item_rs->search($p[0]->{query}->{first}($q,$c), $p[0]->{query}->{second}($q,$c));
}
}
}
return $item_rs;
}
sub is_true {
@ -641,7 +647,7 @@ sub delay_commit {
my ($self, $c, $guard) = @_;
my $allow_delay_commit = 0;
my $cfg = $c->config->{api_debug_opts};
$allow_delay_commit = ((defined $cfg->{allow_delay_commit}) && $cfg->{allow_delay_commit} ? 1 : 0) if defined $cfg;
$allow_delay_commit = ((defined $cfg->{allow_delay_commit}) && $cfg->{allow_delay_commit} ? 1 : 0) if defined $cfg;
if ($allow_delay_commit) {
my $delay = $c->request->header('X-Delay-Commit'); #('Expect');
if ($delay && $delay =~ /\d+/ && $delay > 0 && $delay < 500) {

18
lib/NGCP/Panel/Role/API/CallLists.pm
Unescape View File

@ -25,25 +25,27 @@ sub item_rs {
my $item_rs = $c->model('DB')->resultset('cdr');
if($c->user->roles eq "admin") {
} elsif($c->user->roles eq "reseller") {
$item_rs = $item_rs->search({
$item_rs = $item_rs->search({
-or => [
{ source_provider_id => $c->user->reseller->contract_id },
{ destination_provider_id => $c->user->reseller->contract_id },
],
});
} elsif($c->user->roles eq "subscriberadmin") {
$item_rs = $item_rs->search({
$item_rs = $item_rs->search({
-or => [
{ 'source_account_id' => $c->user->account_id },
{ 'destination_account_id' => $c->user->account_id },
],
});
} else {
$item_rs = $item_rs->search({
'subscriber.id' => $c->user->voip_subscriber->id,
},{
join => 'subscriber',
my $out_rs = $item_rs->search_rs({
source_user_id => $c->user->voip_subscriber->uuid,
});
my $in_rs = $item_rs->search_rs({
destination_user_id => $c->user->voip_subscriber->uuid,
});
$item_rs = $out_rs->union_all($in_rs);
}
$item_rs = $item_rs->search({
-not => [
@ -100,7 +102,7 @@ sub resource_from_item {
my $resource = NGCP::Panel::Utils::CallList::process_cdr_item($c, $item, $owner);
my $datetime_fmt = DateTime::Format::Strptime->new(
pattern => '%F %T',
pattern => '%F %T',
);
$resource->{start_time} = $datetime_fmt->format_datetime($resource->{start_time});
@ -175,7 +177,7 @@ sub get_owner_data {
subscriber => undef,
customer => $cust,
};
}
}
} else {
return {
subscriber => $c->user->voip_subscriber,

5
lib/NGCP/Panel/Utils/Datatables.pm
Unescape View File

@ -9,7 +9,7 @@ use Scalar::Util qw/blessed/;
use DateTime::Format::Strptime;
sub process {
my ($c, $rs, $cols, $row_func) = @_;
my ($c, $rs, $cols, $row_func, $total_row_func) = @_;
my $use_rs_cb = ('CODE' eq (ref $rs));
my $aaData = [];
@ -148,6 +148,9 @@ sub process {
my ($aggregation_method, $accessor) = @{ $aggregate_cols->{$sum_col} };
$aggregations->{$sum_col} = $rs->get_column(\[$accessor])->$aggregation_method;
}
if (defined $total_row_func && (scalar keys %{ $aggregate_cols }) > 0) {
$aggregations = {%{$aggregations}, $total_row_func->($aggregations) };
}
# show specific row on top (e.g. if we come back from a newly created entry)
my $topId = $c->request->params->{iIdOnTop};

4
lib/NGCP/Panel/Widget/Plugin/SubscriberCallsOverview.pm
Unescape View File

@ -28,12 +28,12 @@ around handle => sub {
my $in_rs = $c->model('DB')->resultset('cdr')->search({
destination_user_id => $c->user->uuid,
});
my $calls_rs = $out_rs->union($in_rs)->search(undef, {
my $calls_rs = $out_rs->union_all($in_rs)->search(undef, {
order_by => { -desc => 'me.start_time' },
})->slice(0, 4);
my $sub = $c->user->voip_subscriber;
my $calls = [ map {
my $calls = [ map {
my $call = { $_->get_inflated_columns };
$call->{destination_user_in} = NGCP::Panel::Utils::Subscriber::apply_rewrite(
c => $c, subscriber => $sub, number => $call->{destination_user_in}, direction => 'caller_out'

18
share/templates/subscriber/calllist.tt
Unescape View File

@ -16,7 +16,7 @@ function showCallDetails(callId){
'call_details_container',
uri,
'',
function(){
function(){
$('#'+divId).draggable({
handle: '.modal-header',
cursor: 'crosshair',
@ -30,18 +30,22 @@ function showCallDetails(callId){
<div class="ngcp-separator"></div>
<select id="Calls_table_external_filter">
<option value="">Show all calls</option>
<option value="outcoming">Show only outgoing calls</option>
<option value="incoming">Show incoming calls</option>
<select onChange="changeCalllist(this);" id="Calls_table_external_filter">
<option value="[% c.uri_for_action('/subscriber/ajax_calls', [c.req.captures.0]) -%]">Show all calls</option>
<option value="[% c.uri_for_action('/subscriber/ajax_calls_out', [c.req.captures.0]) -%]">Show outgoing calls only</option>
<option value="[% c.uri_for_action('/subscriber/ajax_calls_in', [c.req.captures.0]) -%]">Show incoming calls only</option>
</select>
<script>
$('#Calls_table_external_filter').change( function() { $('#Calls_table').dataTable().fnFilter( $(this).val() ); } );
function changeCalllist(selection) {
$('#Calls_table').dataTable().fnSettings().sAjaxSource = selection.value;
$('#Calls_table').dataTable().api().ajax.reload();
//$('#Calls_table').dataTable().api().ajax.url(selection.value).load();
}
</script>
<div class="ngcp-separator"></div>
[%PROCESS 'subscriber/call_details_wrapper.tt' %]
[%PROCESS 'subscriber/call_details_wrapper.tt' %]
[%
helper.name = 'Calls';
helper.dt_columns = calls_dt_columns;

Write Preview
Loading…
Cancel
Save