uri_unescape CDRs

Mantis: 3413
agranig/peering-route
Gerhard Jungwirth 12 years ago
parent ae0d9ab8c3
commit ebe64d3563

@ -66,6 +66,7 @@ my $builder = Local::Module::Build->new(
'Template' => 0, 'Template' => 0,
'Text::CSV_XS' => 0, 'Text::CSV_XS' => 0,
'URI::Encode' => 0, 'URI::Encode' => 0,
'URI::Escape' => 0,
'UUID' => 0, 'UUID' => 0,
'XML::Mini' => 0, 'XML::Mini' => 0,
'warnings' => 0, 'warnings' => 0,

@ -2,6 +2,7 @@ package NGCP::Panel::Controller::Subscriber;
use Sipwise::Base; use Sipwise::Base;
BEGIN { extends 'Catalyst::Controller'; } BEGIN { extends 'Catalyst::Controller'; }
use HTML::Entities; use HTML::Entities;
use URI::Escape qw(uri_unescape);
use NGCP::Panel::Utils::Navigation; use NGCP::Panel::Utils::Navigation;
use NGCP::Panel::Utils::Contract; use NGCP::Panel::Utils::Contract;
use NGCP::Panel::Utils::Subscriber; use NGCP::Panel::Utils::Subscriber;
@ -2171,7 +2172,15 @@ sub ajax_calls :Chained('master') :PathPart('calls/ajax') :Args(0) {
destination_user_id => $c->stash->{subscriber}->uuid, destination_user_id => $c->stash->{subscriber}->uuid,
}); });
my $rs = $out_rs->union($in_rs); my $rs = $out_rs->union($in_rs);
NGCP::Panel::Utils::Datatables::process($c, $rs, $c->stash->{calls_dt_columns}); NGCP::Panel::Utils::Datatables::process(
$c, $rs, $c->stash->{calls_dt_columns},
sub {
my ($result) = @_;
my %data = (source_user => uri_unescape($result->source_user),
destination_user => uri_unescape($result->destination_user));
return %data
},
);
$c->detach( $c->view("JSON") ); $c->detach( $c->view("JSON") );
} }

@ -1,13 +1,20 @@
package NGCP::Panel::View::HTML; package NGCP::Panel::View::HTML;
use Sipwise::Base; use Sipwise::Base;
use URI::Escape qw/uri_unescape/;
extends 'Catalyst::View::TT'; extends 'Catalyst::View::TT';
__PACKAGE__->config( __PACKAGE__->config(
TEMPLATE_EXTENSION => '.tt', TEMPLATE_EXTENSION => '.tt',
render_die => 1, render_die => 1,
ENCODING => 'UTF-8', ENCODING => 'UTF-8',
WRAPPER => 'wrapper.tt' WRAPPER => 'wrapper.tt',
FILTERS => {
uri_unescape => sub {
URI::Escape::uri_unescape(@_);
},
},
); );
=head1 NAME =head1 NAME

@ -24,7 +24,7 @@
<i class="icon-circle-arrow-up" style="color:red"></i> <i class="icon-circle-arrow-up" style="color:red"></i>
[% END -%] [% END -%]
</div> </div>
<div class="span8">[% call.destination_user_in %]</div> <div class="span8">[% call.destination_user_in | uri_unescape %]</div>
[% ELSE -%] [% ELSE -%]
<div class="span1"> <div class="span1">
[% IF call.call_status == "ok" -%] [% IF call.call_status == "ok" -%]
@ -33,7 +33,7 @@
<i class="icon-circle-arrow-down" style="color:red"></i> <i class="icon-circle-arrow-down" style="color:red"></i>
[% END -%] [% END -%]
</div> </div>
<div class="span8">[% call.clir ? "anonymous" : call.source_cli %]</div> <div class="span8">[% call.clir ? "anonymous" : call.source_cli | uri_unescape %]</div>
[% END -%] [% END -%]
</div> </div>
<div class="row-fluid"> <div class="row-fluid">

Loading…
Cancel
Save