Bugfix: invalid settingsGet in dev/Stores/Admin/App.js

Cleanup login/logout location reloading
This commit is contained in:
djmaze 2020-09-04 14:36:24 +02:00
parent aeb5275648
commit 097fb4896d
13 changed files with 51 additions and 92 deletions

View file

@ -125,11 +125,7 @@ class AppUser extends AbstractApp {
}
reload() {
if (parent && !!Settings.app('inIframe')) {
parent.location.reload();
} else {
location.reload();
}
(Settings.app('inIframe') ? parent : window).location.reload();
}
reloadFlagsCurrentMessageListAndMessageFromCache() {
@ -896,13 +892,7 @@ class AppUser extends AbstractApp {
}
logout() {
Remote.logout(() => {
this.loginAndLogoutReload(
false,
true,
0 < (Settings.get('ParentEmail')||{length:0}).length
);
});
Remote.logout(() => this.logoutReload(0 < (Settings.get('ParentEmail')||{length:0}).length));
}
bootstartTwoFactorScreen() {