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

MT#18865 adapt use of provisioning.voip_fax_journal

Browse Source 
Change-Id: I55078355e15ad692bfe69d985b89d7c099679b0a
changes/59/5459/1
Kirill Solomko 10 years ago
parent 7c957ad1bb
commit d388ff2ca3
3 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File

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

@ -274,11 +274,12 @@ sub base :Chained('sub_list') :PathPart('') :CaptureArgs(1) {
]);
$c->stash->{fax_dt_columns} = NGCP::Panel::Utils::Datatables::set_columns($c, [
{ name => "id", search => 1, title => $c->loc('#') },
{ name => "the_timestamp", search_from_epoch => 1, search_to_epoch => 1, title => $c->loc('Timestamp') },
{ name => "time", search_from_epoch => 1, search_to_epoch => 1, title => $c->loc('Timestamp') },
{ name => "status", search => 1, title => $c->loc('Status') },
{ name => "duration", search => 1, title => $c->loc('Duration') },
{ name => "direction", search => 1, title => $c->loc('Direction') },
{ name => "peer_number", search => 1, title => $c->loc('Peer Number') },
{ name => "caller", search => 1, title => $c->loc('Caller') },
{ name => "callee", search => 1, title => $c->loc('Callee') },
{ name => "pages", search => 1, title => $c->loc('Pages') },
]);
@ -371,18 +372,18 @@ sub webfax_ajax :Chained('base') :PathPart('webfax/ajax') :Args(0) {
my ($self, $c) = @_;
my $subscriber = $c->stash->{subscriber};
my $fax_rs = $c->model('DB')->resultset('fax_journal')->search({
'subscriber.uuid' => $subscriber->uuid,
my $fax_rs = $c->model('DB')->resultset('voip_fax_journal')->search({
'voip_subscriber.id' => $subscriber->id,
},{
join => 'subscriber',#kamailio.subscriber is meant here
join => { 'provisioning_voip_subscriber' => 'voip_subscriber' },
});
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(
my $destination = {destination => $result->callee};
$data{callee} = NGCP::Panel::Utils::Subscriber::destination_as_string(
$c,
$destination,
$subscriber,

10
lib/NGCP/Panel/Role/API/FaxRecordings.pm
Unescape View File

@ -7,19 +7,19 @@ use parent 'NGCP::Panel::Role::API';
sub _item_rs {
my ($self, $c) = @_;
my $item_rs = $c->model('DB')->resultset('fax_journal')->search({
my $item_rs = $c->model('DB')->resultset('voip_fax_journal')->search({
filename => { '!=' => '' },
'voip_subscriber.id' => { '!=' => undef },
},{
join => { subscriber => { provisioning_voip_subscriber => 'voip_subscriber' } }
join => { 'provisioning_voip_subscriber' => 'voip_subscriber' },
});
if($c->user->roles eq "admin") {
} elsif($c->user->roles eq "reseller") {
$item_rs = $item_rs->search({
'contact.reseller_id' => $c->user->reseller_id
$item_rs = $item_rs->search({
'contact.reseller_id' => $c->user->reseller_id
},{
join => { subscriber => { provisioning_voip_subscriber => { voip_subscriber => { contract => 'contact' } } } }
join => { provisioning_voip_subscriber => { voip_subscriber => { contract => 'contact' } } }
});
}
return $item_rs;

19
lib/NGCP/Panel/Role/API/Faxes.pm
Unescape View File

@ -9,23 +9,24 @@ use TryCatch;
use Data::HAL qw();
use Data::HAL::Link qw();
use HTTP::Status qw(:constants);
use DateTime::Format::Strptime;
use NGCP::Panel::Form::Subscriber::WebfaxAPI;
use NGCP::Panel::Utils::Subscriber;
sub _item_rs {
my ($self, $c) = @_;
my $item_rs = $c->model('DB')->resultset('fax_journal')->search({
my $item_rs = $c->model('DB')->resultset('voip_fax_journal')->search({
'voip_subscriber.id' => { '!=' => undef },
},{
join => { subscriber => { provisioning_voip_subscriber => 'voip_subscriber' } }
join => { 'provisioning_voip_subscriber' => 'voip_subscriber' }
});
if($c->user->roles eq "admin") {
} elsif($c->user->roles eq "reseller") {
$item_rs = $item_rs->search({
'contact.reseller_id' => $c->user->reseller_id
},{
join => { subscriber => { provisioning_voip_subscriber => { voip_subscriber => { contract => 'contact' } } } }
join => { provisioning_voip_subscriber => { voip_subscriber => { contract => 'contact' } } }
});
}
return $item_rs;
@ -50,7 +51,7 @@ sub hal_from_item {
Data::HAL::Link->new(relation => 'collection', href => sprintf("/api/%s/", $self->resource_name)),
Data::HAL::Link->new(relation => 'profile', href => 'http://purl.org/sipwise/ngcp-api/'),
Data::HAL::Link->new(relation => 'self', href => sprintf("%s%d", $self->dispatch_path, $item->id)),
Data::HAL::Link->new(relation => 'ngcp:subscribers', href => sprintf("/api/subscribers/%d", $item->subscriber->provisioning_voip_subscriber->voip_subscriber->id)),
Data::HAL::Link->new(relation => 'ngcp:subscribers', href => sprintf("/api/subscribers/%d", $item->provisioning_voip_subscriber->voip_subscriber->id)),
Data::HAL::Link->new(relation => 'ngcp:faxrecordings', href => sprintf("/api/faxrecordings/%d", $item->id)),
],
relation => 'ngcp:'.$self->resource_name,
@ -66,11 +67,15 @@ sub resource_from_item {
$form //= $self->get_form($c);
my $datetime_fmt = DateTime::Format::Strptime->new(
pattern => '%F %T',
);
my %resource = ();
$resource{id} = int($item->id);
$resource{time} = "" . $item->the_timestamp;
$resource{subscriber_id} = int($item->subscriber->provisioning_voip_subscriber->voip_subscriber->id);
foreach(qw/direction peer_name peer_number reason status quality filename/){
$resource->{time} = $datetime_fmt->format_datetime($item->time);
$resource{subscriber_id} = int($item->provisioning_voip_subscriber->voip_subscriber->id);
foreach(qw/direction caller callee reason status quality filename/){
$resource{$_} = $item->$_;
}
foreach(qw/duration pages signal_rate/){

Write Preview
Loading…
Cancel
Save