MT#61427 Remove quick access to the OLD CSC panel

Removed quick access to the OLD CSC panel from the subscriber
detail page.
The old csc and the mixed mode (old + new) are not supported
anymore.

Additionally the parameter ngcp_panel config parameter
csc_js_enable has been renamed to a more general 'enable'.

Change-Id: Iec60e1aa3e7e1fcdb4a58ec7e922358a0bb596b7
mr13.4
Marco Capetta 7 months ago
parent 0ce365852d
commit c4542d04a2

@ -13,7 +13,7 @@ log4perl.appender.Default.layout.ConversionPattern=%d{ISO8601} [%p] [%F +%L] %m{
<general>
maintenance_mode 0
ui_enable 0
csc_js_enable 1
csc_enable 1
</general>
<api_debug_opts>

@ -104,9 +104,8 @@ sub POST :Allow {
my $url = NGCP::Panel::Utils::Email::rewrite_url(
$c->config->{contact}->{external_base_url},
($c->config->{general}{csc_js_enable} > 0) ?
($c->req->base . 'v2/#/recoverpassword')
: $c->uri_for_action('/subscriber/recover_webpassword')->as_string);
($c->req->base . '#/recoverpassword')
);
$url .= '?uuid=' . $uuid_string;
$c->log->debug("passreset url: $url");

@ -575,9 +575,8 @@ sub recover_webpassword :Chained('/') :PathPart('recoverwebpassword') :Args(0) {
my $subscriber_login_url;
if ($c->config->{general}{csc_js_enable} == 1
or $c->config->{general}{csc_js_enable} == 2) {
$subscriber_login_url = $c->req->base.'v2/#/login';
if ($c->config->{general}{csc_enable} == 1) {
$subscriber_login_url = $c->req->base.'#/login';
} else {
$subscriber_login_url = $c->uri_for('/login/subscriber');
}
@ -3288,8 +3287,7 @@ sub login_to_csc_v2 :Chained('master') :PathPart('login_to_csc_v2') :Args(0) :Do
}
#redirect to server's hostname
my $v2_prefix = $c->config->{general}{csc_js_enable} == 2 ? '/v2/' : '/';
$c->res->redirect("https://" . $c->req->uri->host . $v2_prefix . "?a=$token");
$c->res->redirect("https://" . $c->req->uri->host . "/?a=$token");
}
sub order_pbx_items :Chained('master') :PathPart('orderpbxitems') :Args(0) :Does(ACL) :ACLDetachTo('/denied_page') :AllowedRole(admin) : AllowedRole(reseller) :AllowedRole(ccareadmin) :AllowedRole(ccare) :AllowedRole(subscriberadmin) {

@ -7427,10 +7427,6 @@ msgstr ""
msgid "Login to CSC"
msgstr ""
#: share/templates/subscriber/master.tt
msgid "Login to New CSC"
msgstr ""
#: lib/NGCP/Panel/Utils/DbStrings.pm
msgid "Logo"
msgstr ""

@ -56,11 +56,8 @@
<a class="btn btn-primary btn-large" href="[% href %]"><i class="icon-edit"></i> [% c.loc('Edit') %]</a>
[% IF (c.user.roles == "admin" || c.user.roles == "reseller" ||
c.user.roles == "ccareadmin" || c.user.roles == "ccare") -%]
[% IF c.config.general.csc_js_enable == 0 || c.config.general.csc_js_enable == 2 -%]
<a class="btn btn-primary btn-large" href="[% c.uri_for_action('/subscriber/login_to_csc', [ subscriber.id ]) %]" target="_blank"><i class="icon-user"></i> [% c.loc('Login to CSC') %]</a>
[% END -%]
[% IF c.config.general.csc_js_enable == 1 || c.config.general.csc_js_enable == 2 -%]
<a class="btn btn-primary btn-large" href="[% c.uri_for_action('/subscriber/login_to_csc_v2', [ subscriber.id ]) %]" target="_blank"><i class="icon-user"></i> [% c.loc('Login to New CSC') %]</a>
[% IF c.config.general.csc_enable == 1 -%]
<a class="btn btn-primary btn-large" href="[% c.uri_for_action('/subscriber/login_to_csc_v2', [ subscriber.id ]) %]" target="_blank"><i class="icon-user"></i> [% c.loc('Login to CSC') %]</a>
[% END -%]
[% END -%]
[% END -%]

Loading…
Cancel
Save