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

@ -19,11 +19,11 @@ import * as Local from 'Storage/Client';
import Remote from 'Remote/User/Ajax';
import { getApp } from 'Helper/Apps/User';
import { view, command, ViewType, routeOff, showScreenPopup } from 'Knoin/Knoin';
import { view, command, ViewType, routeOff, showScreenPopup, routeReload } from 'Knoin/Knoin';
import { AbstractViewNext } from 'Knoin/AbstractViewNext';
import { rootAdmin } from 'Common/Links';
const Settings = rl.settings;
@view({
@ -180,9 +180,9 @@ class LoginUserView extends AbstractViewNext {
setTimeout(() => this.querySelector('.inputAdditionalCode').focus(), 100);
} else if (oData.Admin) {
getApp().redirectToAdminPanel();
setTimeout(() => location.href = rootAdmin(), 100);
} else {
getApp().loginAndLogoutReload(false);
routeReload();
}
} else if (oData.ErrorCode) {
this.submitRequest(false);