Commit 4a2ba12d by Takumi Imai

Merge branch 'feature/1.0_check_web_dev' into 'feature/1.0_check_web'

Feature/1.0 check web dev

See merge request !118
parents a3f0c5e5 58f1969f
......@@ -60,7 +60,7 @@ HEADER.processLogout = function () {
COMMON.userSetting().remove(CONSTANT.KEYS.userInfo_sid_local);
// Move to login screen
//window.location = COMMON.ScreenIds.Login;
COMMON.goUrlWithCurrentParams(CONSTANT.PAGE_NAME.LOGIN);
COMMON.avwScreenMove(CONSTANT.PAGE_NAME.LOGIN);
} else {
if (data.errorMessage) {
COMMON.showAlert(null, {message: data.errorMessage});
......
......@@ -94,7 +94,14 @@ SendMessage.postMessage = function (message, operationId, sendType) {
false,
function (json) {
COMMON.closeLoading();
COMMON.showAlert('msgSendPushMessageSuccess', 'success');
//COMMON.showAlert('msgSendPushMessageSuccess', 'success');
COMMON.showConfirm('msgSendPushMessageSuccess', function() {
COMMON.avwScreenMove('dashboard.html');
}, {
titleCode: 'success',
confirmYesCode: 'close',
confirmNoCode: null,
});
},
function () {
console.log('SendMessage.postMessage error');
......
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