Skip to content

C
check
Commit f60213e6 by vietdo
Options

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

parent 8ad7bc56
Showing with 78 additions and 100 deletions
abvw/common/json/lang/lang-en.json
...@@ -158,5 +158,6 @@ ...@@ -158,5 +158,6 @@
"txtUrlValidDate": "validated period", "txtUrlValidDate": "validated period",
"txtMaxDownloadCount": "number of max dl", "txtMaxDownloadCount": "number of max dl",
"msgShareUrlPassword": "When you set a password, please input below.", "msgShareUrlPassword": "When you set a password, please input below.",
"msgStreamingOpenError": "It is the contents that I cannot read in the streaming." "msgStreamingOpenError": "It is the contents that I cannot read in the streaming.",
"msgContentLinkNotOpen": "This content cannot open on WebViewer."
} }
abvw/common/json/lang/lang-ja.json
...@@ -158,5 +158,6 @@ ...@@ -158,5 +158,6 @@
"txtUrlValidDate": "URL有効期間", "txtUrlValidDate": "URL有効期間",
"txtMaxDownloadCount": "最大DL回数", "txtMaxDownloadCount": "最大DL回数",
"msgShareUrlPassword": "パスワードを設定する場合、以下に入力して下さい。", "msgShareUrlPassword": "パスワードを設定する場合、以下に入力して下さい。",
"msgStreamingOpenError": "ストリーミングでは閲覧出来ないコンテンツです。" "msgStreamingOpenError": "ストリーミングでは閲覧出来ないコンテンツです。",
"msgContentLinkNotOpen":"このコンテンツはWeb版で開けません。"
} }
abvw/common/json/lang/lang-ko.json
...@@ -156,5 +156,6 @@ ...@@ -156,5 +156,6 @@
"txtUrlValidDate": "URL유효기간", "txtUrlValidDate": "URL유효기간",
"txtMaxDownloadCount": "최대DL횟수", "txtMaxDownloadCount": "최대DL횟수",
"msgShareUrlPassword": "암호를 설정할경우 다음의 입력란에 입력하십시오.", "msgShareUrlPassword": "암호를 설정할경우 다음의 입력란에 입력하십시오.",
"msgStreamingOpenError": "스트리밍에서는 열람 할 수 없는 컨텐츠입니다." "msgStreamingOpenError": "스트리밍에서는 열람 할 수 없는 컨텐츠입니다.",
"msgContentLinkNotOpen": "이 컨텐츠는 Web판에서 열 수 없습니다."
} }
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){ if(data.contentData.alertMessageLevel && data.contentData.contentType != COMMON.ContentTypeKeys.Type_Others){
if(data.contentData.alertMessageLevel == CONTENTVIEW_CREATEOBJECT.alertMessageLevel.ShowAlert){ if(data.contentData.alertMessageLevel == CONTENTVIEW_CREATEOBJECT.alertMessageLevel.ShowAlert){
if(data.contentData.alertMessage){ if(data.contentData.alertMessage){
...@@ -6245,7 +6245,7 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){ ...@@ -6245,7 +6245,7 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){
'oldContent' : oldContent 'oldContent' : oldContent
}; };
CONTENTVIEW_CREATEOBJECT.showContentConfirmDialog(data.contentData.alertMessageLevel, data.contentData.alertMessage, data.contentData.contentType); CONTENTVIEW_CREATEOBJECT.showContentConfirmDialog(data.contentData.alertMessageLevel, data.contentData.alertMessage);
} }
} }
else if(data.contentData.alertMessageLevel == CONTENTVIEW_CREATEOBJECT.alertMessageLevel.RequirePassword){ else if(data.contentData.alertMessageLevel == CONTENTVIEW_CREATEOBJECT.alertMessageLevel.RequirePassword){
...@@ -6259,48 +6259,29 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){ ...@@ -6259,48 +6259,29 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){
'oldContent' : oldContent 'oldContent' : oldContent
}; };
CONTENTVIEW_CREATEOBJECT.showContentConfirmDialog(data.contentData.alertMessageLevel, data.contentData.contentType); CONTENTVIEW_CREATEOBJECT.showContentConfirmDialog(data.contentData.alertMessageLevel);
} }
else if(data.contentData.alertMessageLevel == CONTENTVIEW_CREATEOBJECT.alertMessageLevel.None){ else if(data.contentData.alertMessageLevel == CONTENTVIEW_CREATEOBJECT.alertMessageLevel.None){
if(data.contentData.contentType == COMMON.ContentTypeKeys.Type_Link){
HEADER.viewLinkContentById(targetContentId); ClientData.common_preContentId(targetContentId);
ClientData.common_prePageNo(page);
}else{
ClientData.common_preContentId(targetContentId); //古いページを保存する
ClientData.common_prePageNo(page); var oldContent = { oldContentID: CONTENTVIEW_GENERAL.contentID, oldPageIndex: CONTENTVIEW_GENERAL.panoPageNo };
var dataJump = ClientData.JumpQueue();
//古いページを保存する dataJump.push(oldContent);
var oldContent = { oldContentID: CONTENTVIEW_GENERAL.contentID, oldPageIndex: CONTENTVIEW_GENERAL.panoPageNo }; ClientData.JumpQueue(dataJump);
var dataJump = ClientData.JumpQueue();
dataJump.push(oldContent); if (CONTENTVIEW_GENERAL.avwUserEnvObj.isMobile() && ClientData.isGetitsMode()) {
ClientData.JumpQueue(dataJump); AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewGetits);
} else {
if (CONTENTVIEW_GENERAL.avwUserEnvObj.isMobile() && ClientData.isGetitsMode()) { CONTENTVIEW.screenMove();
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewGetits); }
} else {
CONTENTVIEW.screenMove();
}
}
} }
} }
//Type 0
else{ else{
ClientData.common_preContentId(targetContentId); CONTENTVIEW.showAlertScreen(I18N.i18nText('msgContentLinkNotOpen'), null);
ClientData.common_prePageNo(page);
/* store old page */
var oldContent = { oldContentID: CONTENTVIEW_GENERAL.contentID, oldPageIndex: CONTENTVIEW_GENERAL.panoPageNo };
var dataJump = ClientData.JumpQueue();
dataJump.push(oldContent);
ClientData.JumpQueue(dataJump);
if (CONTENTVIEW_GENERAL.avwUserEnvObj.isMobile() && ClientData.isGetitsMode()) {
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewGetits);
} else {
CONTENTVIEW.screenMove();
}
} }
}, },
......
abvw/js/contentview_CreateObjects.js
...@@ -1411,19 +1411,19 @@ CONTENTVIEW_CREATEOBJECT.moveToContent = function (mediaType, actionType, id, im ...@@ -1411,19 +1411,19 @@ CONTENTVIEW_CREATEOBJECT.moveToContent = function (mediaType, actionType, id, im
CONTENTVIEW_CREATEOBJECT.moveToContent.prototype = new CONTENTVIEW_CREATEOBJECT.PageObject(); CONTENTVIEW_CREATEOBJECT.moveToContent.prototype = new CONTENTVIEW_CREATEOBJECT.PageObject();
//START TRB00033 - EDITOR: Long - Date : 09/12/2013 - Summary : limit content //START TRB00033 - EDITOR: Long - Date : 09/12/2013 - Summary : limit content
CONTENTVIEW_CREATEOBJECT.showContentConfirmDialog = function(type, msg, contentType) { CONTENTVIEW_CREATEOBJECT.showContentConfirmDialog = function(type, msg) {
if(type == CONTENTVIEW_CREATEOBJECT.alertMessageLevel.ShowAlert){ if(type == CONTENTVIEW_CREATEOBJECT.alertMessageLevel.ShowAlert){
CONTENTVIEW_CREATEOBJECT.createAlertTypeDialog(msg, contentType); CONTENTVIEW_CREATEOBJECT.createAlertTypeDialog(msg);
CONTENTVIEW_GENERAL.showDialog(true); CONTENTVIEW_GENERAL.showDialog(true);
} }
else if(type == CONTENTVIEW_CREATEOBJECT.alertMessageLevel.RequirePassword){ else if(type == CONTENTVIEW_CREATEOBJECT.alertMessageLevel.RequirePassword){
CONTENTVIEW_CREATEOBJECT.createPwdRequiredTypeDialog(contentType); CONTENTVIEW_CREATEOBJECT.createPwdRequiredTypeDialog();
CONTENTVIEW_GENERAL.showDialog(true); CONTENTVIEW_GENERAL.showDialog(true);
} }
}; };
CONTENTVIEW_CREATEOBJECT.createAlertTypeDialog = function(msg, contentType){ CONTENTVIEW_CREATEOBJECT.createAlertTypeDialog = function(msg){
var $container = $('#dialog'); var $container = $('#dialog');
$container.html(''); $container.html('');
$container.addClass('sectionLimitAccess'); $container.addClass('sectionLimitAccess');
...@@ -1448,33 +1448,30 @@ CONTENTVIEW_CREATEOBJECT.createAlertTypeDialog = function(msg, contentType){ ...@@ -1448,33 +1448,30 @@ CONTENTVIEW_CREATEOBJECT.createAlertTypeDialog = function(msg, contentType){
}); });
$('#dialog a#contentAlertOk').click(function(){ $('#dialog a#contentAlertOk').click(function(){
if(contentType == COMMON.ContentTypeKeys.Type_Link){
HEADER.viewLinkContentById(CONTENTVIEW_CREATEOBJECT.moveContentParam.preContentId); ClientData.common_preContentId(CONTENTVIEW_CREATEOBJECT.moveContentParam.preContentId);
ClientData.common_prePageNo(CONTENTVIEW_CREATEOBJECT.moveContentParam.prePageNo);
}else{
ClientData.common_preContentId(CONTENTVIEW_CREATEOBJECT.moveContentParam.preContentId); /* store old page */
ClientData.common_prePageNo(CONTENTVIEW_CREATEOBJECT.moveContentParam.prePageNo); var dataJump = ClientData.JumpQueue();
dataJump.push(CONTENTVIEW_CREATEOBJECT.moveContentParam.oldContent);
/* store old page */ ClientData.JumpQueue(dataJump);
var dataJump = ClientData.JumpQueue();
dataJump.push(CONTENTVIEW_CREATEOBJECT.moveContentParam.oldContent); if(ClientData.isStreamingMode()){
ClientData.JumpQueue(dataJump); //ストリーミングのビューアへ移動
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewStreaming);
if(ClientData.isStreamingMode()){ } else {
//ストリーミングのビューアへ移動 if (CONTENTVIEW_GENERAL.avwUserEnvObj.isMobile() && ClientData.isGetitsMode()) {
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewStreaming); AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewGetits);
} else { } else {
if (CONTENTVIEW_GENERAL.avwUserEnvObj.isMobile() && ClientData.isGetitsMode()) { CONTENTVIEW.screenMove();
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewGetits); }
} else { }
CONTENTVIEW.screenMove();
}
}
}
}); });
}; };
CONTENTVIEW_CREATEOBJECT.createPwdRequiredTypeDialog = function(contentType){ CONTENTVIEW_CREATEOBJECT.createPwdRequiredTypeDialog = function(){
var $container = $('#dialog'); var $container = $('#dialog');
$container.html(''); $container.html('');
$container.addClass('sectionLimitAccess'); $container.addClass('sectionLimitAccess');
...@@ -1524,35 +1521,32 @@ CONTENTVIEW_CREATEOBJECT.createPwdRequiredTypeDialog = function(contentType){ ...@@ -1524,35 +1521,32 @@ CONTENTVIEW_CREATEOBJECT.createPwdRequiredTypeDialog = function(contentType){
AVWEB.avwCmsApiSyncWithUrl(apiLoginUrl, null, 'webClientLogin', 'GET', params, AVWEB.avwCmsApiSyncWithUrl(apiLoginUrl, null, 'webClientLogin', 'GET', params,
function (data) { function (data) {
if (data.result == 'success') { if (data.result == 'success') {
if(contentType == COMMON.ContentTypeKeys.Type_Link){
HEADER.viewLinkContentById(CONTENTVIEW_CREATEOBJECT.moveContentParam.preContentId); ClientData.common_preContentId(CONTENTVIEW_CREATEOBJECT.moveContentParam.preContentId);
ClientData.common_prePageNo(CONTENTVIEW_CREATEOBJECT.moveContentParam.prePageNo);
}else{
ClientData.common_preContentId(CONTENTVIEW_CREATEOBJECT.moveContentParam.preContentId); /* store old page */
ClientData.common_prePageNo(CONTENTVIEW_CREATEOBJECT.moveContentParam.prePageNo); var dataJump = ClientData.JumpQueue();
dataJump.push(CONTENTVIEW_CREATEOBJECT.moveContentParam.oldContent);
/* store old page */ ClientData.JumpQueue(dataJump);
var dataJump = ClientData.JumpQueue();
dataJump.push(CONTENTVIEW_CREATEOBJECT.moveContentParam.oldContent); // update sid id
ClientData.JumpQueue(dataJump); ClientData.userInfo_sid(data.sid);
ClientData.userInfo_sid_local(data.sid);
// update sid id //バックアップにも保持
ClientData.userInfo_sid(data.sid); ClientData.userInfo_sid_local_bak(data.sid);
ClientData.userInfo_sid_local(data.sid);
//バックアップにも保持 if(ClientData.isStreamingMode()){
ClientData.userInfo_sid_local_bak(data.sid); //ストリーミングのビューアへ移動
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewStreaming);
if(ClientData.isStreamingMode()){ } else {
//ストリーミングのビューアへ移動 if (CONTENTVIEW_GENERAL.avwUserEnvObj.isMobile() && ClientData.isGetitsMode()) {
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewStreaming); AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewGetits);
} else { } else {
if (CONTENTVIEW_GENERAL.avwUserEnvObj.isMobile() && ClientData.isGetitsMode()) { CONTENTVIEW.screenMove();
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewGetits); }
} else { }
CONTENTVIEW.screenMove();
}
}
}
} }
else { else {
$('#lblMessageLimitError').html(AVWEB.format(I18N.i18nText('msgLoginErrWrong'), data.errorMessage).toString()).show(); $('#lblMessageLimitError').html(AVWEB.format(I18N.i18nText('msgLoginErrWrong'), data.errorMessage).toString()).show();
......
abvw/js/header.js
...@@ -1102,7 +1102,7 @@ HEADER.getIconTypeContent = function(contentType) { ...@@ -1102,7 +1102,7 @@ HEADER.getIconTypeContent = function(contentType) {
src = 'img/bookshelf/icon_12.png'; src = 'img/bookshelf/icon_12.png';
break; break;
} }
default: break default: break;
} }
return src; return src;
}; };
......
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