EVOgeek
/
Vmeda.Online
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2535 from crazyserver/MOBILE-3554 

MOBILE-3554 login: Add forceLoginLogo setting to avoid showing web logo
main
Juan Leyva 2020-09-22 13:24:44 +02:00 committed by GitHub
parent df815e2191 0e5c448a82
commit ebaa8be899
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/config.json
View File

@ -98,6 +98,7 @@
"enableanalytics": false, "enableanalytics": false,
"enableonboarding": true, "enableonboarding": true,
"forceColorScheme": "", "forceColorScheme": "",
"forceLoginLogo": false,
"ioswebviewscheme": "moodleappfs", "ioswebviewscheme": "moodleappfs",
"appstores": { "appstores": {
"android": "com.moodle.moodlemobile", "android": "com.moodle.moodlemobile",

2
src/core/login/pages/credentials/credentials.ts
View File

@ -70,7 +70,7 @@ export class CoreLoginCredentialsPage {
this.siteUrl = navParams.get('siteUrl'); this.siteUrl = navParams.get('siteUrl');
this.siteName = navParams.get('siteName') || null; this.siteName = navParams.get('siteName') || null;
this.logoUrl = navParams.get('logoUrl') || null; this.logoUrl = !CoreConfigConstants.forceLoginLogo && navParams.get('logoUrl') || null;
this.siteConfig = navParams.get('siteConfig'); this.siteConfig = navParams.get('siteConfig');
this.urlToOpen = navParams.get('urlToOpen'); this.urlToOpen = navParams.get('urlToOpen');

2
src/core/login/providers/helper.ts
View File

@ -411,7 +411,7 @@ export class CoreLoginHelperProvider {
* @return Logo URL. * @return Logo URL.
*/ */
getLogoUrl(config: any): string { getLogoUrl(config: any): string {
return config ? (config.logourl || config.compactlogourl) : null; return !CoreConfigConstants.forceLoginLogo && config ? (config.logourl || config.compactlogourl) : null;
} }
/** /**