Skip to content

C
check
You need to sign in or sign up before continuing.
Commit a7768994 by vietdo
Options

#19267 vtour対応

parent b6c16d1e
Showing with 27 additions and 11 deletions
abvw/js/contentview.js
......@@ -6232,7 +6232,6 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){
//既存ログを送信する
COMMON.SetEndLog(CONTENTVIEW_GENERAL.contentID);
COMMON.RegisterLog();
console.log("data.contentData.alertMessageLevel:"+data.contentData.alertMessageLevel);
if(data.contentData.alertMessageLevel){
if(data.contentData.alertMessageLevel == CONTENTVIEW_CREATEOBJECT.alertMessageLevel.ShowAlert){
......@@ -6246,7 +6245,7 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){
'oldContent' : oldContent
};
CONTENTVIEW_CREATEOBJECT.showContentConfirmDialog(data.contentData.alertMessageLevel, data.contentData.alertMessage);
CONTENTVIEW_CREATEOBJECT.showContentConfirmDialog(data.contentData.alertMessageLevel, data.contentData.alertMessage, data.contentData.contentType);
}
}
else if(data.contentData.alertMessageLevel == CONTENTVIEW_CREATEOBJECT.alertMessageLevel.RequirePassword){
......@@ -6260,9 +6259,13 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){
'oldContent' : oldContent
};
CONTENTVIEW_CREATEOBJECT.showContentConfirmDialog(data.contentData.alertMessageLevel);
CONTENTVIEW_CREATEOBJECT.showContentConfirmDialog(data.contentData.alertMessageLevel, data.contentData.contentType);
}
else if(data.contentData.alertMessageLevel == CONTENTVIEW_CREATEOBJECT.alertMessageLevel.None){
if(data.contentData.contentType == COMMON.ContentTypeKeys.Type_Link){
HEADER.viewLinkContentById(targetContentId);
}else{
ClientData.common_preContentId(targetContentId);
ClientData.common_prePageNo(page);
......@@ -6277,6 +6280,7 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){
} else {
CONTENTVIEW.screenMove();
}
}
}
}
......
abvw/js/contentview_CreateObjects.js
......@@ -1328,7 +1328,7 @@ CONTENTVIEW_CREATEOBJECT.moveToContent = function (mediaType, actionType, id, im
'oldContent' : oldContent
};
CONTENTVIEW_CREATEOBJECT.showContentConfirmDialog(data.contentData.alertMessageLevel, data.contentData.alertMessage);
CONTENTVIEW_CREATEOBJECT.showContentConfirmDialog(data.contentData.alertMessageLevel, data.contentData.alertMessage, data.contentData.contentType);
}
}
else if(data.contentData.alertMessageLevel == CONTENTVIEW_CREATEOBJECT.alertMessageLevel.RequirePassword){
......@@ -1342,9 +1342,12 @@ CONTENTVIEW_CREATEOBJECT.moveToContent = function (mediaType, actionType, id, im
'oldContent' : oldContent
};
CONTENTVIEW_CREATEOBJECT.showContentConfirmDialog(data.contentData.alertMessageLevel);
CONTENTVIEW_CREATEOBJECT.showContentConfirmDialog(data.contentData.alertMessageLevel, data.contentData.contentType);
}
else if(data.contentData.alertMessageLevel == CONTENTVIEW_CREATEOBJECT.alertMessageLevel.None){
if(data.contentData.contentType == COMMON.ContentTypeKeys.Type_Link){
HEADER.viewLinkContentById(contentId);
}else{
ClientData.common_preContentId(contentId);
ClientData.common_prePageNo(pageNo);
......@@ -1366,6 +1369,7 @@ CONTENTVIEW_CREATEOBJECT.moveToContent = function (mediaType, actionType, id, im
}
}
}
}
//Type 0
else{
ClientData.common_preContentId(contentId);
......@@ -1407,19 +1411,19 @@ CONTENTVIEW_CREATEOBJECT.moveToContent = function (mediaType, actionType, id, im
CONTENTVIEW_CREATEOBJECT.moveToContent.prototype = new CONTENTVIEW_CREATEOBJECT.PageObject();
//START TRB00033 - EDITOR: Long - Date : 09/12/2013 - Summary : limit content
CONTENTVIEW_CREATEOBJECT.showContentConfirmDialog = function(type, msg) {
CONTENTVIEW_CREATEOBJECT.showContentConfirmDialog = function(type, msg, contentType) {
if(type == CONTENTVIEW_CREATEOBJECT.alertMessageLevel.ShowAlert){
CONTENTVIEW_CREATEOBJECT.createAlertTypeDialog(msg);
CONTENTVIEW_CREATEOBJECT.createAlertTypeDialog(msg, contentType);
CONTENTVIEW_GENERAL.showDialog(true);
}
else if(type == CONTENTVIEW_CREATEOBJECT.alertMessageLevel.RequirePassword){
CONTENTVIEW_CREATEOBJECT.createPwdRequiredTypeDialog();
CONTENTVIEW_CREATEOBJECT.createPwdRequiredTypeDialog(contentType);
CONTENTVIEW_GENERAL.showDialog(true);
}
};
CONTENTVIEW_CREATEOBJECT.createAlertTypeDialog = function(msg){
CONTENTVIEW_CREATEOBJECT.createAlertTypeDialog = function(msg, contentType){
var $container = $('#dialog');
$container.html('');
$container.addClass('sectionLimitAccess');
......@@ -1444,7 +1448,10 @@ CONTENTVIEW_CREATEOBJECT.createAlertTypeDialog = function(msg){
});
$('#dialog a#contentAlertOk').click(function(){
if(contentType = COMMON.ContentTypeKeys.Type_Link){
HEADER.viewLinkContentById(CONTENTVIEW_CREATEOBJECT.moveContentParam.preContentId);
}else{
ClientData.common_preContentId(CONTENTVIEW_CREATEOBJECT.moveContentParam.preContentId);
ClientData.common_prePageNo(CONTENTVIEW_CREATEOBJECT.moveContentParam.prePageNo);
......@@ -1463,11 +1470,11 @@ CONTENTVIEW_CREATEOBJECT.createAlertTypeDialog = function(msg){
CONTENTVIEW.screenMove();
}
}
}
});
};
CONTENTVIEW_CREATEOBJECT.createPwdRequiredTypeDialog = function(){
CONTENTVIEW_CREATEOBJECT.createPwdRequiredTypeDialog = function(contentType){
var $container = $('#dialog');
$container.html('');
$container.addClass('sectionLimitAccess');
......@@ -1517,6 +1524,10 @@ CONTENTVIEW_CREATEOBJECT.createPwdRequiredTypeDialog = function(){
AVWEB.avwCmsApiSyncWithUrl(apiLoginUrl, null, 'webClientLogin', 'GET', params,
function (data) {
if (data.result == 'success') {
if(contentType == COMMON.ContentTypeKeys.Type_Link){
HEADER.viewLinkContentById(CONTENTVIEW_CREATEOBJECT.moveContentParam.preContentId);
}else{
ClientData.common_preContentId(CONTENTVIEW_CREATEOBJECT.moveContentParam.preContentId);
ClientData.common_prePageNo(CONTENTVIEW_CREATEOBJECT.moveContentParam.prePageNo);
......@@ -1542,6 +1553,7 @@ CONTENTVIEW_CREATEOBJECT.createPwdRequiredTypeDialog = function(){
}
}
}
}
else {
$('#lblMessageLimitError').html(AVWEB.format(I18N.i18nText('msgLoginErrWrong'), data.errorMessage).toString()).show();
}
......
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