From a8bc49408a61bab3b238096f28654b8d9ef06e5d Mon Sep 17 00:00:00 2001 From: Kirill Solomko Date: Tue, 5 Jul 2022 16:47:57 +0200 Subject: [PATCH] TT#182053 Header Manipulations feature is hidden for CE * "Header Manipulations" UI is now hidden for CE * /api/headerrulesets is now hidden for CE * /api/headerrules is now hidden for CE * /api/headerruleconditions is now hidden for CE * /api/headerruleactions is now hidden for CE Change-Id: I717b9d3cdf693f01e32f81086b69aafce4f3113a --- lib/NGCP/Panel/Controller/API/HeaderRuleActions.pm | 1 + lib/NGCP/Panel/Controller/API/HeaderRuleActionsItem.pm | 1 + lib/NGCP/Panel/Controller/API/HeaderRuleConditions.pm | 1 + lib/NGCP/Panel/Controller/API/HeaderRuleConditionsItem.pm | 1 + lib/NGCP/Panel/Controller/API/HeaderRuleSets.pm | 1 + lib/NGCP/Panel/Controller/API/HeaderRuleSetsItem.pm | 1 + lib/NGCP/Panel/Controller/API/HeaderRules.pm | 1 + lib/NGCP/Panel/Controller/API/HeaderRulesItem.pm | 1 + share/templates/subscriber/preferences.tt | 2 ++ share/templates/widgets/admin_topmenu_settings.tt | 2 ++ 10 files changed, 12 insertions(+) diff --git a/lib/NGCP/Panel/Controller/API/HeaderRuleActions.pm b/lib/NGCP/Panel/Controller/API/HeaderRuleActions.pm index eecf5ddefb..1793c70d75 100644 --- a/lib/NGCP/Panel/Controller/API/HeaderRuleActions.pm +++ b/lib/NGCP/Panel/Controller/API/HeaderRuleActions.pm @@ -9,6 +9,7 @@ use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::HeaderRuleActi __PACKAGE__->set_config({ allowed_roles => [qw/admin reseller/], + allowed_ngcp_types => [qw/carrier sppro/], }); sub allowed_methods { diff --git a/lib/NGCP/Panel/Controller/API/HeaderRuleActionsItem.pm b/lib/NGCP/Panel/Controller/API/HeaderRuleActionsItem.pm index ac44aee080..e740440749 100644 --- a/lib/NGCP/Panel/Controller/API/HeaderRuleActionsItem.pm +++ b/lib/NGCP/Panel/Controller/API/HeaderRuleActionsItem.pm @@ -12,6 +12,7 @@ __PACKAGE__->set_config({ Default => [qw/admin reseller/], Journal => [qw/admin reseller/], }, + allowed_ngcp_types => [qw/carrier sppro/], PATCH => { ops => [qw/add replace remove copy/] }, }); diff --git a/lib/NGCP/Panel/Controller/API/HeaderRuleConditions.pm b/lib/NGCP/Panel/Controller/API/HeaderRuleConditions.pm index 29e45c1654..a7773813aa 100644 --- a/lib/NGCP/Panel/Controller/API/HeaderRuleConditions.pm +++ b/lib/NGCP/Panel/Controller/API/HeaderRuleConditions.pm @@ -9,6 +9,7 @@ use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::HeaderRuleCond __PACKAGE__->set_config({ allowed_roles => [qw/admin reseller/], + allowed_ngcp_types => [qw/carrier sppro/], }); sub allowed_methods { diff --git a/lib/NGCP/Panel/Controller/API/HeaderRuleConditionsItem.pm b/lib/NGCP/Panel/Controller/API/HeaderRuleConditionsItem.pm index 4cdd358cc4..d73b1d5001 100644 --- a/lib/NGCP/Panel/Controller/API/HeaderRuleConditionsItem.pm +++ b/lib/NGCP/Panel/Controller/API/HeaderRuleConditionsItem.pm @@ -12,6 +12,7 @@ __PACKAGE__->set_config({ Default => [qw/admin reseller/], Journal => [qw/admin reseller/], }, + allowed_ngcp_types => [qw/carrier sppro/], PATCH => { ops => [qw/add replace remove copy/] }, }); diff --git a/lib/NGCP/Panel/Controller/API/HeaderRuleSets.pm b/lib/NGCP/Panel/Controller/API/HeaderRuleSets.pm index 1c01e96928..8fdd637c68 100644 --- a/lib/NGCP/Panel/Controller/API/HeaderRuleSets.pm +++ b/lib/NGCP/Panel/Controller/API/HeaderRuleSets.pm @@ -8,6 +8,7 @@ use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::HeaderRuleSets __PACKAGE__->set_config({ allowed_roles => [qw/admin reseller/], + allowed_ngcp_types => [qw/carrier sppro/], }); sub allowed_methods { diff --git a/lib/NGCP/Panel/Controller/API/HeaderRuleSetsItem.pm b/lib/NGCP/Panel/Controller/API/HeaderRuleSetsItem.pm index 465bb3b4cd..6748aa0424 100644 --- a/lib/NGCP/Panel/Controller/API/HeaderRuleSetsItem.pm +++ b/lib/NGCP/Panel/Controller/API/HeaderRuleSetsItem.pm @@ -12,6 +12,7 @@ __PACKAGE__->set_config({ Default => [qw/admin reseller/], Journal => [qw/admin reseller/], }, + allowed_ngcp_types => [qw/carrier sppro/], PATCH => { ops => [qw/add replace remove copy/] }, }); diff --git a/lib/NGCP/Panel/Controller/API/HeaderRules.pm b/lib/NGCP/Panel/Controller/API/HeaderRules.pm index bbb225573b..184a699f1a 100644 --- a/lib/NGCP/Panel/Controller/API/HeaderRules.pm +++ b/lib/NGCP/Panel/Controller/API/HeaderRules.pm @@ -9,6 +9,7 @@ use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::HeaderRules/; __PACKAGE__->set_config({ allowed_roles => [qw/admin reseller/], + allowed_ngcp_types => [qw/carrier sppro/], }); sub allowed_methods { diff --git a/lib/NGCP/Panel/Controller/API/HeaderRulesItem.pm b/lib/NGCP/Panel/Controller/API/HeaderRulesItem.pm index d3216db605..3c2a753ece 100644 --- a/lib/NGCP/Panel/Controller/API/HeaderRulesItem.pm +++ b/lib/NGCP/Panel/Controller/API/HeaderRulesItem.pm @@ -12,6 +12,7 @@ __PACKAGE__->set_config({ Default => [qw/admin reseller/], Journal => [qw/admin reseller/], }, + allowed_ngcp_types => [qw/carrier sppro/], PATCH => { ops => [qw/add replace remove copy/] }, }); diff --git a/share/templates/subscriber/preferences.tt b/share/templates/subscriber/preferences.tt index 525e9f6a9b..7a08399290 100644 --- a/share/templates/subscriber/preferences.tt +++ b/share/templates/subscriber/preferences.tt @@ -962,6 +962,7 @@ $( document ).ready(function() { [% END -%] +[% IF c.config.general.ngcp_type != 'spce' -%] [% UNLESS c.user.roles == 'subscriber' || c.user.roles == 'subscriberadmin' -%]
@@ -1013,6 +1014,7 @@ $( document ).ready(function() {
[% END -%] +[% END -%] [% UNLESS c.user.roles == 'subscriber' || c.user.roles == 'subscriberadmin' -%]
diff --git a/share/templates/widgets/admin_topmenu_settings.tt b/share/templates/widgets/admin_topmenu_settings.tt index 94ab6daa2b..b6ef6c7607 100644 --- a/share/templates/widgets/admin_topmenu_settings.tt +++ b/share/templates/widgets/admin_topmenu_settings.tt @@ -80,7 +80,9 @@ [% END -%]
  • [% c.loc('Peerings') %]
  • [% c.loc('Rewrite Rule Sets') %]
  • + [% IF c.config.general.ngcp_type != 'spce' -%]
  • [% c.loc('Header Manipulations') %]
  • + [% END -%]
  • [% c.loc('NCOS Levels') %]
  • [% c.loc('Sound Sets') %]
  • [% c.loc('Email Templates') %]