Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
check
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abook_web
check
Commits
4a2ba12d
Commit
4a2ba12d
authored
Dec 12, 2022
by
Takumi Imai
Browse files
Options
Browse Files
Download
Plain Diff
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
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
2 deletions
+9
-2
abweb/common/js/header.js
+1
-1
abweb/js/sendMessage/sendMessage.js
+8
-1
No files found.
abweb/common/js/header.js
View file @
4a2ba12d
...
...
@@ -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
});
...
...
abweb/js/sendMessage/sendMessage.js
View file @
4a2ba12d
...
...
@@ -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'
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment