Skip to content

C
check
Commit 3960692e by Takumi Imai
Options

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

Feature/1.0 check web dev 50268

See merge request !17
parents d394f378 f91ad189
Showing with 13 additions and 11 deletions
abvw/html/push-message-detail.html
......@@ -24,11 +24,17 @@
<script src="../common/js/constant.js?__UPDATEID__"></script>
<script src="../common/js/common.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/template/template.js"></script>
<script type="text/javascript" src="../js/pushMessageDetail/push-message-detail.js"></script>
<script type="text/javascript">
$(document).ready(function(){
PushMessageDetail.init();
});
</script>
</head>
<body onload="PushMessageDetail.init();">
<body>
<!-- header -->
<div id="includedHeader"></div>
......@@ -40,7 +46,7 @@
<nav aria-label="breadcrumb">
<ol class="breadcrumb px-0 mb-0">
<li class="breadcrumb-item"><a href="dashboard.html" class="text-decoration-none text-underline lang" lang="dashboard"></a></li>
<li class="breadcrumb-item"><a href="message-list.html" class="text-decoration-none text-underline lang" lang="messageListTitle"></a></li>
<li class="breadcrumb-item"><a href="push-message-list.html" class="text-decoration-none text-underline lang" lang="messageListTitle"></a></li>
<li class="breadcrumb-item active lang" lang="messageDetail" aria-current="page"><span></span></li>
</ol>
</nav>
......
abvw/js/pushMessageDetail/push-message-detail.js
......@@ -3,6 +3,7 @@ var PushMessageDetail = {};
PushMessageDetail.baseApiUrl = CONSTANT.URL.CMS.BASE + ClientData.userInfo_accountPath() + CONSTANT.URL.CMS.API.BASE + 'pushMessageDetail/';
PushMessageDetail.dummyMessageDetailJson = {
pushMessageId: 1,
pushMessage: "内容が入ります。内容が入ります。内容が入ります。内容が入ります。",
pushSendDate: "2022/07/06 14:14",
operationName: "絞り検索",
......@@ -10,9 +11,7 @@ PushMessageDetail.dummyMessageDetailJson = {
}
PushMessageDetail.init = function() {
$("#includedHeader").load("../common/header.html" , function() {
I18N.initi18n();
});
TEMPLATE.loadHearder("#includedHeader");
let urlParam = COMMON.getUrlParameter();
if (typeof urlParam !== 'object' || typeof urlParam.pushMessageId === 'undefined') {
return;
......@@ -28,15 +27,12 @@ PushMessageDetail.getMessageDetail = function(pushMessageId, callback) {
pushMessageId: pushMessageId
};
const url = PushMessageDetail.baseApiUrl;
COMMON.cmsAjax(url, param, false, function (json) {
if (callback) {
callback(json);
COMMON.cmsAjax(url, param, true, function (json) {
if (callback && json && json.pushMessage) {
callback(json.pushMessage);
}
}, function() {
console.log('PushMessageDetail.getMessageDetail error');
if (callback) {
callback(PushMessageDetail.dummyMessageDetailJson);
}
});
}
......
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