MT#17173 fix item filtering in API

item_rs from API.pm was not executed before

Change-Id: I803f5680d174820db9497d4f7cc1902bfa54a9ab
changes/59/5059/2
Gerhard Jungwirth 10 years ago
parent 102934a625
commit bb03c1ff46

@ -11,7 +11,7 @@ use NGCP::Panel::Utils::DateTime;
use NGCP::Panel::Form::Administrator::Admin;
use NGCP::Panel::Form::Administrator::Reseller;
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs = $c->model('DB')->resultset('admins');

@ -12,7 +12,7 @@ use HTTP::Status qw(:constants);
use NGCP::Panel::Form::RewriteRule::ApplyAPI;
sub item_rs {
sub _item_rs {
}
sub get_form {

@ -55,7 +55,7 @@ sub hal_from_item {
return $hal;
}
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs;

@ -46,7 +46,7 @@ sub _contract_rs {
#return $item_rs;
}
sub item_rs {
sub _item_rs {
my $self = shift;
return $self->_contract_rs(@_);

@ -13,7 +13,7 @@ use NGCP::Panel::Utils::DateTime;
use NGCP::Panel::Utils::Contract;
use NGCP::Panel::Form::BillingFee::API;
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs = $c->model('DB')->resultset('billing_fees');

@ -66,7 +66,7 @@ sub hal_from_item {
return $hal;
}
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs = $c->model('DB')->resultset('billing_networks')->search_rs({ 'me.status' => { '!=' => 'terminated' } });

@ -15,7 +15,7 @@ use NGCP::Panel::Utils::Contract;
use NGCP::Panel::Form::BillingProfile::PeaktimeAPI qw();
use NGCP::Panel::Utils::Billing qw();
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs = $c->model('DB')->resultset('billing_profiles');

@ -13,7 +13,7 @@ use NGCP::Panel::Utils::DateTime;
use NGCP::Panel::Utils::Contract;
use NGCP::Panel::Form::BillingZone::API qw();
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs = $c->model('DB')->resultset('billing_zones');

@ -67,7 +67,7 @@ sub hal_from_item {
return $hal;
}
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs;

@ -73,7 +73,7 @@ sub hal_from_item {
return $hal;
}
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs;

@ -70,7 +70,7 @@ sub hal_from_item {
return $hal;
}
sub item_rs {
sub _item_rs {
my ($self, $c, $type) = @_;
my $item_rs;

@ -64,7 +64,7 @@ sub hal_from_item {
return $hal;
}
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs;

@ -12,7 +12,7 @@ use HTTP::Status qw(:constants);
use NGCP::Panel::Form::CallControl::CallAPI;
sub item_rs {
sub _item_rs {
}
sub get_form {

@ -69,7 +69,7 @@ sub hal_from_item {
return $hal;
}
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs;

@ -16,7 +16,7 @@ use NGCP::Panel::Utils::CallList;
use NGCP::Panel::Utils::Subscriber;
use NGCP::Panel::Form::CallList::Subscriber;
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs = $c->model('DB')->resultset('cdr');

@ -12,7 +12,7 @@ use HTTP::Status qw(:constants);
use NGCP::Panel::Form::Call::Admin;
use NGCP::Panel::Form::Call::Reseller;
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs = $c->model('DB')->resultset('cdr');

@ -14,7 +14,7 @@ use NGCP::Panel::Utils::Contract;
use NGCP::Panel::Utils::ProfilePackages qw();
use NGCP::Panel::Form::Contract::ContractAPI qw();
sub item_rs {
sub _item_rs {
my ($self, $c, $include_terminated,$now) = @_;
my $item_rs = NGCP::Panel::Utils::Contract::get_contract_rs(

@ -14,7 +14,7 @@ use NGCP::Panel::Utils::Contract;
use NGCP::Panel::Utils::ProfilePackages qw();
use NGCP::Panel::Utils::DateTime;
sub item_rs {
sub _item_rs {
my ($self, $c, $include_terminated,$now) = @_;

@ -12,7 +12,7 @@ use HTTP::Status qw(:constants);
use NGCP::Panel::Form::Contact::Admin;
use NGCP::Panel::Form::Contact::Reseller;
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs = $c->model('DB')->resultset('contacts')

@ -9,7 +9,7 @@ use HTTP::Status qw(:constants);
use NGCP::Panel::Form::CustomerFraudEvents::Admin;
use NGCP::Panel::Form::CustomerFraudEvents::Reseller;
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs = $c->model('DB')->resultset('contract_fraud_events')->search(

@ -129,7 +129,7 @@ sub query_param_string {
return $query_string;
}
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs = NGCP::Panel::Utils::Contract::get_customer_rs(c => $c);

@ -16,7 +16,7 @@ use NGCP::Panel::Utils::Preferences;
use NGCP::Panel::Utils::Subscriber qw();
use NGCP::Panel::Form::Contract::CustomerAPI qw();
sub item_rs {
sub _item_rs {
my ($self, $c, $now) = @_;
# returns a contracts rs filtered based on role

@ -117,7 +117,7 @@ sub hal_from_item {
return $hal;
}
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs;

@ -12,7 +12,7 @@ use HTTP::Status qw(:constants);
use NGCP::Panel::Form::EmailTemplate::Admin;
use NGCP::Panel::Form::EmailTemplate::Reseller;
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs = $c->model('DB')->resultset('email_templates');

@ -4,7 +4,7 @@ use NGCP::Panel::Utils::Generic qw(:all);
use base 'NGCP::Panel::Role::API';
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs = $c->model('DB')->resultset('fax_journal')->search({

@ -12,7 +12,7 @@ use HTTP::Status qw(:constants);
use NGCP::Panel::Form::Subscriber::WebfaxAPI;
use NGCP::Panel::Utils::Subscriber;
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs = $c->model('DB')->resultset('fax_journal')->search({

@ -81,7 +81,7 @@ sub hal_from_item {
return $hal;
}
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs;

@ -10,7 +10,7 @@ use Data::HAL::Link qw();
use HTTP::Status qw(:constants);
use NGCP::Panel::Form::InterceptionAPI;
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs = $c->model('InterceptDB')->resultset('voip_intercept')->search({

@ -12,7 +12,7 @@ use HTTP::Status qw(:constants);
use NGCP::Panel::Form::Invoice::TemplateAdmin;
use NGCP::Panel::Form::Invoice::TemplateReseller;
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs = $c->model('DB')->resultset('invoice_templates');

@ -11,7 +11,7 @@ use Data::HAL::Link qw();
use HTTP::Status qw(:constants);
use NGCP::Panel::Form::Invoice::InvoiceAPI;
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs = $c->model('DB')->resultset('invoices');

@ -11,7 +11,7 @@ use Data::HAL::Link qw();
use HTTP::Status qw(:constants);
use NGCP::Panel::Form::Lnp::Carrier;
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs = $c->model('DB')->resultset('lnp_providers');

@ -11,7 +11,7 @@ use Data::HAL::Link qw();
use HTTP::Status qw(:constants);
use NGCP::Panel::Form::Lnp::Number;
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs = $c->model('DB')->resultset('lnp_numbers');

@ -84,7 +84,7 @@ sub hal_from_item {
return $hal;
}
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs;

@ -13,7 +13,7 @@ use NGCP::Panel::Form::MaliciousCall::Admin;
use NGCP::Panel::Form::MaliciousCall::Reseller;
use Data::Dumper;
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs = $c->model('DB')->resultset('malicious_calls');

@ -12,7 +12,7 @@ use HTTP::Status qw(:constants);
use NGCP::Panel::Form::NCOS::ResellerLevelAPI;
use NGCP::Panel::Form::NCOS::AdminLevelAPI;
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs = $c->model('DB')->resultset('ncos_levels');

@ -11,7 +11,7 @@ use Data::HAL::Link qw();
use HTTP::Status qw(:constants);
use NGCP::Panel::Form::NCOS::LnpAPI;
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs = $c->model('DB')->resultset('ncos_lnp_list');

@ -11,7 +11,7 @@ use Data::HAL::Link qw();
use HTTP::Status qw(:constants);
use NGCP::Panel::Form::NCOS::PatternAPI;
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs = $c->model('DB')->resultset('ncos_pattern_list');

@ -11,7 +11,7 @@ use Data::HAL::Link qw();
use HTTP::Status qw(:constants);
use NGCP::Panel::Form::Device::ConfigAPI;
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs = $c->model('DB')->resultset('autoprov_configs');

@ -11,7 +11,7 @@ use Data::HAL::Link qw();
use HTTP::Status qw(:constants);
use NGCP::Panel::Form::Device::FirmwareAPI;
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs = $c->model('DB')->resultset('autoprov_firmwares');

@ -89,7 +89,7 @@ sub resource_from_item {
return \%resource;
}
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs = $c->model('DB')->resultset('autoprov_devices');
if($c->user->roles eq "admin") {

@ -63,7 +63,7 @@ sub resource_from_item {
return \%resource;
}
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs = $c->model('DB')->resultset('autoprov_profiles');
if($c->user->roles eq "admin") {

@ -80,7 +80,7 @@ sub resource_from_item {
return \%resource;
}
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs = $c->model('DB')->resultset('autoprov_field_devices');

@ -16,7 +16,7 @@ sub dispatch_path{return '/api/peeringgroups/';}
sub relation{return 'http://purl.org/sipwise/ngcp-api/#rel-peeringgroups';}
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs = $c->model('DB')->resultset('voip_peer_groups');
return $item_rs;

@ -12,7 +12,7 @@ use HTTP::Status qw(:constants);
use NGCP::Panel::Form::Peering::RuleAPI;
use NGCP::Panel::Utils::Peering;
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs = $c->model('DB')->resultset('voip_peer_rules');
return $item_rs;

@ -12,7 +12,7 @@ use HTTP::Status qw(:constants);
use NGCP::Panel::Form::Peering::ServerAPI;
use NGCP::Panel::Utils::Peering;
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs = $c->model('DB')->resultset('voip_peer_hosts');
return $item_rs;

@ -217,7 +217,7 @@ sub get_resource {
return $resource;
}
sub item_rs {
sub _item_rs {
my ($self, $c, $type) = @_;
my $item_rs;

@ -86,7 +86,7 @@ sub hal_from_item {
return $hal;
}
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs = $c->model('DB')->resultset('profile_packages')->search_rs(); #{ 'me.status' => { '!=' => 'terminated' } });

@ -11,7 +11,7 @@ use Data::HAL::Link qw();
use HTTP::Status qw(:constants);
use NGCP::Panel::Form::Reminder::API;
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs = $c->model('DB')->resultset('voip_reminder');

@ -12,7 +12,7 @@ use HTTP::Status qw(:constants);
use NGCP::Panel::Utils::DateTime;
use NGCP::Panel::Form::ResellerAPI qw();
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
# no restriction needed, as only admins have access here?

@ -73,7 +73,7 @@ sub hal_from_item {
return $hal;
}
sub item_rs {
sub _item_rs {
my ($self, $c, $type) = @_;
my $item_rs;

@ -54,7 +54,7 @@ sub hal_from_item {
return $hal;
}
sub item_rs {
sub _item_rs {
my ($self, $c, $type) = @_;
my $item_rs;

@ -67,7 +67,7 @@ sub hal_from_item {
return $hal;
}
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs;

@ -31,7 +31,7 @@ sub transcode_data {
return $resource;
}
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs = $c->model('DB')->resultset('voip_sound_files')->search(

@ -11,7 +11,7 @@ use Data::HAL::Link qw();
use HTTP::Status qw(:constants);
use NGCP::Panel::Form::Sound::HandleAPI;
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs = $c->model('DB')->resultset('voip_sound_handles')->search({}, {

@ -12,7 +12,7 @@ use HTTP::Status qw(:constants);
use NGCP::Panel::Form::Sound::AdminSet;
use NGCP::Panel::Form::Sound::ResellerSet;
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs = $c->model('DB')->resultset('voip_sound_sets');

@ -58,7 +58,7 @@ sub hal_from_item {
return $hal;
}
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs;

@ -12,7 +12,7 @@ use HTTP::Status qw(:constants);
use NGCP::Panel::Form::SubscriberProfile::SetAdmin;
use NGCP::Panel::Form::SubscriberProfile::SetReseller;
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs = $c->model('DB')->resultset('voip_subscriber_profile_sets');

@ -11,7 +11,7 @@ use Data::HAL::Link qw();
use HTTP::Status qw(:constants);
use NGCP::Panel::Form::SubscriberProfile::ApiProfile;
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs = $c->model('DB')->resultset('voip_subscriber_profiles');

@ -12,7 +12,7 @@ use HTTP::Status qw(:constants);
use NGCP::Panel::Form::Subscriber::RegisteredAPI;
use NGCP::Panel::Utils::Kamailio;
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my @joins = ();;

@ -143,7 +143,7 @@ sub hal_from_item {
return $hal;
}
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs;

@ -11,7 +11,7 @@ use Data::HAL::Link qw();
use HTTP::Status qw(:constants);
use NGCP::Panel::Form::Contact::Reseller;
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs = $c->model('DB')->resultset('contacts')

@ -12,7 +12,7 @@ use HTTP::Status qw(:constants);
use NGCP::Panel::Form::Topup::Log;
use Data::Dumper;
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs = $c->model('DB')->resultset('topup_logs');

@ -11,7 +11,7 @@ use Data::HAL::Link qw();
use HTTP::Status qw(:constants);
use NGCP::Panel::Form::Subscriber::TrustedSourceAPI;
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs = $c->model('DB')->resultset('voip_trusted_sources');

@ -4,7 +4,7 @@ use NGCP::Panel::Utils::Generic qw(:all);
use base 'NGCP::Panel::Role::API';
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs = $c->model('DB')->resultset('voicemail_spool')->search({

@ -11,7 +11,7 @@ use Data::HAL::Link qw();
use HTTP::Status qw(:constants);
use NGCP::Panel::Form::Voicemail::API;
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs = $c->model('DB')->resultset('voicemail_users');

@ -12,7 +12,7 @@ use HTTP::Status qw(:constants);
use NGCP::Panel::Form::Voicemail::Meta;
use NGCP::Panel::Utils::Subscriber;
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs = $c->model('DB')->resultset('voicemail_spool')->search({

@ -13,7 +13,7 @@ use NGCP::Panel::Form::Voucher::AdminAPI;
use NGCP::Panel::Form::Voucher::ResellerAPI;
use NGCP::Panel::Utils::Voucher;
sub item_rs {
sub _item_rs {
my ($self, $c) = @_;
my $item_rs = $c->model('DB')->resultset('vouchers');

Loading…
Cancel
Save