Commit b446ac6a by Masaru Abe

#12154 複数端末からログイン時のシステムエラーから自力復旧対応

parent 5a33db74
...@@ -776,8 +776,17 @@ function showSystemError() { ...@@ -776,8 +776,17 @@ function showSystemError() {
$().toastmessage('showToast', { $().toastmessage('showToast', {
type: 'error', type: 'error',
sticky: true, sticky: true,
text: errMes text: errMes,
}); close: function() {
//ログアウト時と同じ後始末処理をしてログイン画面に戻す
if( !webLogoutEvent() ){
//ログアウト出来なかった
SessionStorageUtils.clear();
avwUserSetting().remove(Keys.userInfo_sid);
avwScreenMove(ScreenIds.Login);
}
}
});
/* /*
$().toastmessage('showToast', { $().toastmessage('showToast', {
type: 'error', type: 'error',
......
...@@ -426,19 +426,32 @@ function historyClickFunction(){ ...@@ -426,19 +426,32 @@ function historyClickFunction(){
//Web Logout Event //Web Logout Event
function webLogoutEvent(){ function webLogoutEvent(){
var isExisted = false;
var params = { var params = {
sid: ClientData.userInfo_sid() sid: ClientData.userInfo_sid()
}; };
avwCmsApiSync(ClientData.userInfo_accountPath(), "webLogout", "GET", params, avwCmsApiSync(ClientData.userInfo_accountPath(), "webLogout", "GET", params,
function (data) { function (data) {
isExisted = true;
SessionStorageUtils.clear(); SessionStorageUtils.clear();
avwUserSetting().remove(Keys.userInfo_sid); avwUserSetting().remove(Keys.userInfo_sid);
// Move to login screen // Move to login screen
//window.location = ScreenIds.Login; //window.location = ScreenIds.Login;
avwScreenMove(ScreenIds.Login); avwScreenMove(ScreenIds.Login);
}, },
null); function (xmlHttpRequest, txtStatus, errorThrown) {
if (xmlHttpRequest.status == 403) {
isExisted = false;
}
else {
// Show system error
isExisted = true;
}
});
return isExisted;
}; };
//Logout Without Backup function //Logout Without Backup function
......
Markdown is supported
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