Skip to content

C
check
Commit 6fcdbd06 by vietdo
Options

#20023 ブラウザ】コンテンツ間リンクにその他コンテンツが指定された場合、表示できない

parent fffb2ee3
Showing with 8 additions and 5 deletions
abvw/js/contentview.js
...@@ -6232,7 +6232,7 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){ ...@@ -6232,7 +6232,7 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){
//既存ログを送信する //既存ログを送信する
COMMON.SetEndLog(CONTENTVIEW_GENERAL.contentID); COMMON.SetEndLog(CONTENTVIEW_GENERAL.contentID);
COMMON.RegisterLog(); COMMON.RegisterLog();
if(data.contentData.alertMessageLevel && data.contentData.contentType != COMMON.ContentTypeKeys.Type_Others){ if(data.contentData.alertMessageLevel){
if(data.contentData.alertMessageLevel == CONTENTVIEW_CREATEOBJECT.alertMessageLevel.ShowAlert){ if(data.contentData.alertMessageLevel == CONTENTVIEW_CREATEOBJECT.alertMessageLevel.ShowAlert){
if(data.contentData.alertMessage){ if(data.contentData.alertMessage){
...@@ -6261,10 +6261,12 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){ ...@@ -6261,10 +6261,12 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){
CONTENTVIEW_CREATEOBJECT.showContentConfirmDialog(data.contentData.alertMessageLevel, data.contentData.contentType); CONTENTVIEW_CREATEOBJECT.showContentConfirmDialog(data.contentData.alertMessageLevel, data.contentData.contentType);
} }
else if(data.contentData.alertMessageLevel == CONTENTVIEW_CREATEOBJECT.alertMessageLevel.None){ else if(data.contentData.alertMessageLevel == CONTENTVIEW_CREATEOBJECT.alertMessageLevel.None){console.log("contentType:"+data.contentData.contentType);
if(data.contentData.contentType == COMMON.ContentTypeKeys.Type_Link){ if(data.contentData.contentType == COMMON.ContentTypeKeys.Type_Link){
HEADER.viewLinkContentById(targetContentId); HEADER.viewLinkContentById(targetContentId);
}else if(data.contentData.contentType == COMMON.ContentTypeKeys.Type_Others){
HEADER.downloadResourceById(targetContentId);
}else{ }else{
ClientData.common_preContentId(targetContentId); ClientData.common_preContentId(targetContentId);
ClientData.common_prePageNo(page); ClientData.common_prePageNo(page);
...@@ -6284,9 +6286,6 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){ ...@@ -6284,9 +6286,6 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){
} }
} }
else{
CONTENTVIEW.showAlertScreen(I18N.i18nText('msgContentLinkNotOpen'), null);
}
}, },
function (xmlHttpRequest, txtStatus, errorThrown) { function (xmlHttpRequest, txtStatus, errorThrown) {
......
abvw/js/contentview_CreateObjects.js
...@@ -1451,6 +1451,8 @@ CONTENTVIEW_CREATEOBJECT.createAlertTypeDialog = function(msg, contentType){ ...@@ -1451,6 +1451,8 @@ CONTENTVIEW_CREATEOBJECT.createAlertTypeDialog = function(msg, contentType){
if(contentType == COMMON.ContentTypeKeys.Type_Link){ if(contentType == COMMON.ContentTypeKeys.Type_Link){
HEADER.viewLinkContentById(CONTENTVIEW_CREATEOBJECT.moveContentParam.preContentId); HEADER.viewLinkContentById(CONTENTVIEW_CREATEOBJECT.moveContentParam.preContentId);
}else if(contentType == COMMON.ContentTypeKeys.Type_Others){
HEADER.downloadResourceById(CONTENTVIEW_CREATEOBJECT.moveContentParam.preContentId);
}else{ }else{
ClientData.common_preContentId(CONTENTVIEW_CREATEOBJECT.moveContentParam.preContentId); ClientData.common_preContentId(CONTENTVIEW_CREATEOBJECT.moveContentParam.preContentId);
ClientData.common_prePageNo(CONTENTVIEW_CREATEOBJECT.moveContentParam.prePageNo); ClientData.common_prePageNo(CONTENTVIEW_CREATEOBJECT.moveContentParam.prePageNo);
...@@ -1527,6 +1529,8 @@ CONTENTVIEW_CREATEOBJECT.createPwdRequiredTypeDialog = function(contentType){ ...@@ -1527,6 +1529,8 @@ CONTENTVIEW_CREATEOBJECT.createPwdRequiredTypeDialog = function(contentType){
if(contentType == COMMON.ContentTypeKeys.Type_Link){ if(contentType == COMMON.ContentTypeKeys.Type_Link){
HEADER.viewLinkContentById(CONTENTVIEW_CREATEOBJECT.moveContentParam.preContentId); HEADER.viewLinkContentById(CONTENTVIEW_CREATEOBJECT.moveContentParam.preContentId);
}else if(contentType == COMMON.ContentTypeKeys.Type_Others){
HEADER.downloadResourceById(CONTENTVIEW_CREATEOBJECT.moveContentParam.preContentId);
}else{ }else{
ClientData.common_preContentId(CONTENTVIEW_CREATEOBJECT.moveContentParam.preContentId); ClientData.common_preContentId(CONTENTVIEW_CREATEOBJECT.moveContentParam.preContentId);
ClientData.common_prePageNo(CONTENTVIEW_CREATEOBJECT.moveContentParam.prePageNo); ClientData.common_prePageNo(CONTENTVIEW_CREATEOBJECT.moveContentParam.prePageNo);
......
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