Unverified Commit 9733914c authored by Rajeev's avatar Rajeev Committed by GitHub
Browse files

Merge pull request #3947 from rajeshkumaravel/release-2.8.10

Issue #SB-18773 fix: Custom footer API call issue
parents 620551c1 47459b70
master Dark_theme SB-25589 SB-28090 aws_fileRead contributions dependabot/npm_and_yarn/src/app/client/decode-uri-component-0.2.2 dependabot/npm_and_yarn/src/app/decode-uri-component-0.2.2 dependabot/npm_and_yarn/src/app/express-4.17.3 dependabot/npm_and_yarn/src/app/jsonwebtoken-9.0.0 dependabot/npm_and_yarn/src/desktop/OpenRAP/decode-uri-component-0.2.2 dependabot/npm_and_yarn/src/desktop/OpenRAP/express-4.17.3 dependabot/npm_and_yarn/src/desktop/OpenRAP/jsonwebtoken-9.0.0 dependabot/npm_and_yarn/src/desktop/OpenRAP/qs-6.5.3 dependabot/npm_and_yarn/src/desktop/decode-uri-component-0.2.2 dependabot/npm_and_yarn/src/desktop/express-4.17.3 dependabot/npm_and_yarn/src/desktop/jsonwebtoken-9.0.0 dependabot/npm_and_yarn/src/desktop/qs-6.10.3 filters_5.1.1 gcp gcp_test keshavprasadms-patch-1 keshavprasadms-patch-2 release-2.10.0 release-2.10.1 release-2.10.2 release-2.10.3 release-2.8.10 release-2.8.11 release-2.8.12 release-3.0 release-3.0-merge release-3.0.0 release-3.0.1 release-3.0.2 release-3.0.3 release-3.0.4 release-3.0.4-sso release-3.1.0 release-3.1.1 release-3.1.2 release-3.2.0 release-3.2.1 release-3.2.10 release-3.2.11 release-3.2.12 release-3.2.13 release-3.2.14 release-3.2.2 release-3.2.3 release-3.2.4 release-3.3.0 release-3.3.0-telemetry-fix release-3.3.1 release-3.3.2 release-3.4.0 release-3.4.1 release-3.4.2 release-3.4.3 release-3.4.4 release-3.4.5 release-3.4.6 release-3.4.7 release-3.5.0 release-3.5.1 release-3.5.2 release-3.5.3 release-3.6.0 release-3.6.1 release-3.6.5 release-3.6.6 release-3.7.0 release-3.7.1 release-3.7.2 release-3.8.0 release-3.8.1 release-3.8.2 release-3.8.3 release-3.9.0 release-3.9.1 release-3.9.2 release-3.9.3 release-4.0.0 release-4.0.1 release-4.0.2 release-4.1 release-4.1.0 release-4.1.1 release-4.10.0 release-4.10.0.1 release-4.10.1 release-4.10.2 release-4.10.2.1 release-4.10.2.2 release-4.10.3 release-4.2.0 release-4.2.1 release-4.3.0 release-4.3.1 release-4.4.0 release-4.4.1 release-4.5.0 release-4.5.1 release-4.5.2 release-4.6.0 release-4.7.0 release-4.7.1 release-4.8.0 release-4.8.5 release-4.9.0 release-4.9.1 release-5.0.0 release-5.0.0.1 release-5.0.0.2 release-5.0.0.3 release-5.0.1 release-5.0.2 release-5.1.0 release-5.1.1 revert-4427-player-cache-issue revert-4537-SB-19763 revert-5244-sh-809 revert-5260-SB-table-3.3.0 revert-8284-release-5.0.0 sharathkashyap-patch-1 Tags unavailable
No related merge requests found
Showing with 10 additions and 2 deletions
+10 -2
......@@ -58,7 +58,8 @@ export class TenantService extends DataService {
* Variable that holds default tenant value
*/
private _defaultTenant = '';
// TODO refactor the igot specific changes
slugForIgot = '';
/**
* The constructor
* @param {HttpClient} http Reference of HttpClient.
......@@ -70,7 +71,9 @@ export class TenantService extends DataService {
this.config = config;
this.baseUrl = this.config.urlConFig.URLS.TENANT_PREFIX;
this._defaultTenant = (<HTMLInputElement>document.getElementById('defaultTenant'))
? (<HTMLInputElement>document.getElementById('defaultTenant')).value : null;
? (<HTMLInputElement>document.getElementById('defaultTenant')).value : null;
this.slugForIgot = (<HTMLInputElement>document.getElementById('slugForProminentFilter')) ?
(<HTMLInputElement>document.getElementById('slugForProminentFilter')).value : null;
}
/**
......@@ -117,6 +120,11 @@ export class TenantService extends DataService {
}
public getTenantConfig(slug: string) {
if ((slug && slug !== '') && slug === this.slugForIgot) {
slug = this.slugForIgot;
} else {
slug = this._defaultTenant;
}
const url = `${this.config.urlConFig.URLS.SYSTEM_SETTING.TENANT_CONFIG + '/'}` + slug;
return this.learnerService.get({
url: url
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment