Skip to content

C
check
Commit 4849bacd by vietdo
Options

#15771【Chrome42】CMS でオーサリングのプレビューを行うと、Web Viewer で多重ログインの問題が発生する

parent 6635352b
Showing with 38 additions and 17 deletions
abvw/common/js/common.js
...@@ -75,8 +75,7 @@ COMMON.ContentTypeKeys = { ...@@ -75,8 +75,7 @@ COMMON.ContentTypeKeys = {
Type_Html : 'html', Type_Html : 'html',
Type_Enquete : 'enquete', Type_Enquete : 'enquete',
Type_Exam : 'exam', Type_Exam : 'exam',
Type_Link : 'url', Type_Link : 'url'
Type_PanoMovie : 'panoMovie'
}; };
/* /*
...@@ -187,6 +186,7 @@ COMMON.Keys = { ...@@ -187,6 +186,7 @@ COMMON.Keys = {
/* -------------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------------- */
// Session/local:ユーザ情報(userInfo)_セッションID:String // Session/local:ユーザ情報(userInfo)_セッションID:String
userInfo_sid : 'sid', userInfo_sid : 'sid',
userInfo_sid_preview : 'sidPreview',
// Session :事業者オプション(serviceOpt)_初回ログイン時パスワード強制変更:Integer(0:なし, 1:催促, 2:強制) // Session :事業者オプション(serviceOpt)_初回ログイン時パスワード強制変更:Integer(0:なし, 1:催促, 2:強制)
serviceOpt_force_pw_change_on_login : 'force_pw_change_on_login', serviceOpt_force_pw_change_on_login : 'force_pw_change_on_login',
// Session :事業者オプション(serviceOpt)_定期ログイン時パスワード強制変更:Integer(0:なし, 1:催促, 2:強制) // Session :事業者オプション(serviceOpt)_定期ログイン時パスワード強制変更:Integer(0:なし, 1:催促, 2:強制)
...@@ -633,6 +633,13 @@ var ClientData = { ...@@ -633,6 +633,13 @@ var ClientData = {
return AVWEB.avwUserSetting().get(COMMON.Keys.userInfo_sid); return AVWEB.avwUserSetting().get(COMMON.Keys.userInfo_sid);
} }
}, },
userInfo_sid_local_preview : function(data) {
if (arguments.length > 0) {
AVWEB.avwUserSetting().set(COMMON.Keys.userInfo_sid_preview, data);
} else {
return AVWEB.avwUserSetting().get(COMMON.Keys.userInfo_sid_preview);
}
},
// Local :ユーザ情報(userInfo)_ログインID:String // Local :ユーザ情報(userInfo)_ログインID:String
userInfo_loginId : function(data) { userInfo_loginId : function(data) {
if (arguments.length > 0) { if (arguments.length > 0) {
...@@ -1124,7 +1131,18 @@ var ClientData = { ...@@ -1124,7 +1131,18 @@ var ClientData = {
return null; return null;
} }
}, },
userInfo_sid_preview : function(data) {
if (arguments.length > 0) {
SessionStorageUtils.set(COMMON.Keys.userInfo_sid_preview, data);
// AVWEB.avwUserSetting().set(COMMON.Keys.userInfo_sid, data);
} else {
// return AVWEB.avwUserSetting().get(COMMON.Keys.userInfo_sid);
if (AVWEB.avwUserSession()) {
return SessionStorageUtils.get(COMMON.Keys.userInfo_sid_preview);
}
return null;
}
},
// Session :事業者オプション(serviceOpt)_初回ログイン時パスワード強制変更:Integer(0:なし, 1:催促, 2:強制) // Session :事業者オプション(serviceOpt)_初回ログイン時パスワード強制変更:Integer(0:なし, 1:催促, 2:強制)
serviceOpt_force_pw_change_on_login : function(data) { serviceOpt_force_pw_change_on_login : function(data) {
if (arguments.length > 0) { if (arguments.length > 0) {
...@@ -2375,15 +2393,10 @@ COMMON.SetStartLog = function(strContentId) { ...@@ -2375,15 +2393,10 @@ COMMON.SetStartLog = function(strContentId) {
log.longitude = ClientData.longitude(); log.longitude = ClientData.longitude();
// PageLog 1ページ目セット（１レコードは必須） // PageLog 1ページ目セット（１レコードは必須）
if(!CONTENTVIEW.isMediaAndHTMLContent() && CONTENTVIEW_GENERAL.contentType != COMMON.ContentTypeKeys.Type_Image
&& CONTENTVIEW_GENERAL.contentType != COMMON.ContentTypeKeys.Type_Others
&& CONTENTVIEW_GENERAL.contentType != COMMON.ContentTypeKeys.Type_Enquete
&& CONTENTVIEW_GENERAL.contentType != COMMON.ContentTypeKeys.Type_Exam
){
var pageLog = new PageLogEntity(); var pageLog = new PageLogEntity();
pageLog.contentid = strContentId; pageLog.contentid = strContentId;
log.pageLogArray.push(pageLog); log.pageLogArray.push(pageLog);
}
// Add to storage // Add to storage
arrContentLogs.push(log); arrContentLogs.push(log);
} }
......
abvw/js/contentpreview.js
...@@ -12,8 +12,8 @@ CONTENTPREVIEW.ready = function(){ ...@@ -12,8 +12,8 @@ CONTENTPREVIEW.ready = function(){
var sid = COMMON.getUrlParam('sid',''); var sid = COMMON.getUrlParam('sid','');
var contentId = COMMON.getUrlParam('contentId',''); var contentId = COMMON.getUrlParam('contentId','');
var urlPath = COMMON.getUrlParam('urlpath',''); var urlPath = COMMON.getUrlParam('urlpath','');
ClientData.userInfo_sid(sid); ClientData.userInfo_sid_preview(sid);console.log("pid" + ClientData.userInfo_sid_preview(sid));
ClientData.userInfo_sid_local(sid); ClientData.userInfo_sid_local_preview(sid);
ClientData.userInfo_accountPath(urlPath); ClientData.userInfo_accountPath(urlPath);
ClientData.contentInfo_contentId(contentId); ClientData.contentInfo_contentId(contentId);
......
abvw/js/contentview.js
...@@ -4413,7 +4413,7 @@ CONTENTVIEW.draw = function(context, opt) { ...@@ -4413,7 +4413,7 @@ CONTENTVIEW.draw = function(context, opt) {
context.save(); context.save();
//Draw on main canvas //Draw on main canvas
if(opt==null || opt == 0){console.log("CONTENTVIEW_GETDATA.getContent().currentPage.drawPage(context)" + CONTENTVIEW_GETDATA.getContent().currentPage.drawPage(context)); if(opt==null || opt == 0){
/* draw page objects */ /* draw page objects */
CONTENTVIEW_GETDATA.getContent().currentPage.drawPage(context); CONTENTVIEW_GETDATA.getContent().currentPage.drawPage(context);
} }
...@@ -5998,6 +5998,13 @@ CONTENTVIEW.handleDisplayMobileToolbar = function(){ ...@@ -5998,6 +5998,13 @@ CONTENTVIEW.handleDisplayMobileToolbar = function(){
CONTENTVIEW.getSessionId = function(){ CONTENTVIEW.getSessionId = function(){
if(COMMON.isAuthoringPreview()){
if(ClientData.userInfo_sid_local_preview()){console.log("pid1"+ ClientData.userInfo_sid_local_preview())
return ClientData.userInfo_sid_local_preview();
}else{console.log("pid2"+ ClientData.userInfo_sid_preview())
return ClientData.userInfo_sid_preview();
}
}else{
if (ClientData.userInfo_sid_local()) { if (ClientData.userInfo_sid_local()) {
return ClientData.userInfo_sid_local(); return ClientData.userInfo_sid_local();
} else if (ClientData.userInfo_sid_local_bak()) { } else if (ClientData.userInfo_sid_local_bak()) {
...@@ -6005,6 +6012,7 @@ CONTENTVIEW.getSessionId = function(){ ...@@ -6005,6 +6012,7 @@ CONTENTVIEW.getSessionId = function(){
} else { } else {
return ClientData.userInfo_sid(); return ClientData.userInfo_sid();
} }
}
}; };
......
abvw/js/contentview_CallApi.js
...@@ -12,7 +12,7 @@ CONTENTVIEW_CALLAPI.getJsonContentInfo = function( doneFunc ) { ...@@ -12,7 +12,7 @@ CONTENTVIEW_CALLAPI.getJsonContentInfo = function( doneFunc ) {
//console.log("CONTENTVIEW_CALLAPI.getJsonContentInfo"); //console.log("CONTENTVIEW_CALLAPI.getJsonContentInfo");
AVWEB.avwGrabContentPageImage(ClientData.userInfo_accountPath(), AVWEB.avwGrabContentPageImage(ClientData.userInfo_accountPath(),
{ contentId: CONTENTVIEW_GENERAL.contentID, sid: ClientData.userInfo_sid(), pageNo: 1 }, { contentId: CONTENTVIEW_GENERAL.contentID, sid: CONTENTVIEW.getSessionId(), pageNo: 1 },
function (data) { function (data) {
CONTENTVIEW_GENERAL.pageImages = data; CONTENTVIEW_GENERAL.pageImages = data;
CONTENTVIEW_CALLAPI.getJsonContentInfoDone(doneFunc); CONTENTVIEW_CALLAPI.getJsonContentInfoDone(doneFunc);
......
abvw/js/contentview_Events.js
...@@ -365,7 +365,7 @@ CONTENTVIEW_EVENTS.firstPage_click = function() { ...@@ -365,7 +365,7 @@ CONTENTVIEW_EVENTS.firstPage_click = function() {
if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PDF){ if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PDF){
AVWEB.avwGrabContentPageImage(ClientData.userInfo_accountPath(), AVWEB.avwGrabContentPageImage(ClientData.userInfo_accountPath(),
{ contentId: CONTENTVIEW_GENERAL.contentID, sid: ClientData.userInfo_sid(), pageNo: 1 }, { contentId: CONTENTVIEW_GENERAL.contentID, sid: CONTENTVIEW.getSessionId(), pageNo: 1 },
function (data) { function (data) {
CONTENTVIEW_GENERAL.pageImages = data; CONTENTVIEW_GENERAL.pageImages = data;
...@@ -435,7 +435,7 @@ CONTENTVIEW_EVENTS.lastPage_click = function() { ...@@ -435,7 +435,7 @@ CONTENTVIEW_EVENTS.lastPage_click = function() {
AVWEB.avwGrabContentPageImage( AVWEB.avwGrabContentPageImage(
ClientData.userInfo_accountPath(), ClientData.userInfo_accountPath(),
{ contentId: CONTENTVIEW_GENERAL.contentID, sid: ClientData.userInfo_sid(), pageNo: CONTENTVIEW_GENERAL.totalPage }, { contentId: CONTENTVIEW_GENERAL.contentID, sid: CONTENTVIEW.getSessionId(), pageNo: CONTENTVIEW_GENERAL.totalPage },
function (data) { function (data) {
CONTENTVIEW_GENERAL.pageImages = data; CONTENTVIEW_GENERAL.pageImages = data;
/* get page Objects */ /* get page Objects */
......
abvw/js/contentview_GetData.js
...@@ -1373,7 +1373,7 @@ CONTENTVIEW_GETDATA.renderNextPage = function(){ ...@@ -1373,7 +1373,7 @@ CONTENTVIEW_GETDATA.renderNextPage = function(){
//console.log("CONTENTVIEW_GETDATA.renderNextPage"); //console.log("CONTENTVIEW_GETDATA.renderNextPage");
AVWEB.avwGrabContentPageImage(ClientData.userInfo_accountPath(), AVWEB.avwGrabContentPageImage(ClientData.userInfo_accountPath(),
{ contentId: CONTENTVIEW_GENERAL.contentID, sid: ClientData.userInfo_sid(), pageNo: pageNo }, { contentId: CONTENTVIEW_GENERAL.contentID, sid: CONTENTVIEW.getSessionId(), pageNo: pageNo },
function (data) { function (data) {
CONTENTVIEW_GENERAL.nextPageImage = data; CONTENTVIEW_GENERAL.nextPageImage = data;
...@@ -1410,7 +1410,7 @@ CONTENTVIEW_GETDATA.renderPrevPage = function(){ ...@@ -1410,7 +1410,7 @@ CONTENTVIEW_GETDATA.renderPrevPage = function(){
//console.log("CONTENTVIEW_GETDATA.renderPrevPage"); //console.log("CONTENTVIEW_GETDATA.renderPrevPage");
AVWEB.avwGrabContentPageImage(ClientData.userInfo_accountPath(), AVWEB.avwGrabContentPageImage(ClientData.userInfo_accountPath(),
{ contentId: CONTENTVIEW_GENERAL.contentID, sid: ClientData.userInfo_sid(), pageNo: pageNo }, { contentId: CONTENTVIEW_GENERAL.contentID, sid: CONTENTVIEW.getSessionId(), pageNo: pageNo },
function (data) { function (data) {
CONTENTVIEW_GENERAL.prevPageImage = data; CONTENTVIEW_GENERAL.prevPageImage = data;
CONTENTVIEW_GENERAL.prevContent.setPageImages(CONTENTVIEW_GENERAL.totalPage, CONTENTVIEW_GENERAL.prevPageImage) CONTENTVIEW_GENERAL.prevContent.setPageImages(CONTENTVIEW_GENERAL.totalPage, CONTENTVIEW_GENERAL.prevPageImage)
......
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