#20090【Web 1.7】コンテンツ間リンクでリンクコンテンツが開けない

abvw/js/contentview.js

@@ -6245,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){
@@ -6259,25 +6259,29 @@ 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){
-                	 
-            		 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);
-                     ClientData.JumpQueue(dataJump);
-                     
-                 	if (CONTENTVIEW_GENERAL.avwUserEnvObj.isMobile() && ClientData.isGetitsMode()) {
-                 		AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewGetits);
-                 	} else {
-                 		CONTENTVIEW.screenMove();
-                 	}
- 
+                	 if(data.contentData.contentType == COMMON.ContentTypeKeys.Type_Link){
+                		 HEADER.viewLinkContentById(targetContentId);
+                		 
+                	 }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);
+                         ClientData.JumpQueue(dataJump);
+                         
+                     	 if (CONTENTVIEW_GENERAL.avwUserEnvObj.isMobile() && ClientData.isGetitsMode()) {
+                     		 AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewGetits);
+                     	 } else {
+                     		 CONTENTVIEW.screenMove();
+                     	 }
+                	 }
+
                  }
              }
              else{

abvw/js/contentview_CreateObjects.js

@@ -1411,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');
@@ -1448,30 +1448,33 @@ CONTENTVIEW_CREATEOBJECT.createAlertTypeDialog = function(msg){
     });
 
     $('#dialog a#contentAlertOk').click(function(){
-    	
-		ClientData.common_preContentId(CONTENTVIEW_CREATEOBJECT.moveContentParam.preContentId);
-        ClientData.common_prePageNo(CONTENTVIEW_CREATEOBJECT.moveContentParam.prePageNo);
-
-        /* store old page */
-        var dataJump = ClientData.JumpQueue();
-        dataJump.push(CONTENTVIEW_CREATEOBJECT.moveContentParam.oldContent);
-        ClientData.JumpQueue(dataJump);
-
-        if(ClientData.isStreamingMode()){
-        	//ストリーミングのビューアへ移動
-        	AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewStreaming);
-        } else {
-        	if (CONTENTVIEW_GENERAL.avwUserEnvObj.isMobile() && ClientData.isGetitsMode()) {
-        		AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewGetits);
-        	} else {
-        		CONTENTVIEW.screenMove();
-        	}
-        }
-    	    
+    	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);
+
+            /* store old page */
+            var dataJump = ClientData.JumpQueue();
+            dataJump.push(CONTENTVIEW_CREATEOBJECT.moveContentParam.oldContent);
+            ClientData.JumpQueue(dataJump);
+
+            if(ClientData.isStreamingMode()){
+            	//ストリーミングのビューアへ移動
+            	AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewStreaming);
+            } else {
+            	if (CONTENTVIEW_GENERAL.avwUserEnvObj.isMobile() && ClientData.isGetitsMode()) {
+            		AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewGetits);
+            	} else {
+            		CONTENTVIEW.screenMove();
+            	}
+            }
+    	}   
     });
 };
 
-CONTENTVIEW_CREATEOBJECT.createPwdRequiredTypeDialog = function(){
+CONTENTVIEW_CREATEOBJECT.createPwdRequiredTypeDialog = function(contentType){
     var $container = $('#dialog');
     $container.html('');
     $container.addClass('sectionLimitAccess');
@@ -1521,32 +1524,36 @@ CONTENTVIEW_CREATEOBJECT.createPwdRequiredTypeDialog = function(){
             AVWEB.avwCmsApiSyncWithUrl(apiLoginUrl, null, 'webClientLogin', 'GET', params,
         function (data) {
             if (data.result == 'success') {
-            	
-        		ClientData.common_preContentId(CONTENTVIEW_CREATEOBJECT.moveContentParam.preContentId);
-                ClientData.common_prePageNo(CONTENTVIEW_CREATEOBJECT.moveContentParam.prePageNo);
-
-                /* store old page */
-                var dataJump = ClientData.JumpQueue();
-                dataJump.push(CONTENTVIEW_CREATEOBJECT.moveContentParam.oldContent);
-                ClientData.JumpQueue(dataJump);
-
-                // update sid id
-                ClientData.userInfo_sid(data.sid);
-                ClientData.userInfo_sid_local(data.sid);
-                //バックアップにも保持
-                ClientData.userInfo_sid_local_bak(data.sid);
-
-                if(ClientData.isStreamingMode()){
-                	//ストリーミングのビューアへ移動
-                	AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewStreaming);
-                } else {
-                	if (CONTENTVIEW_GENERAL.avwUserEnvObj.isMobile() && ClientData.isGetitsMode()) {
-                		AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewGetits);
-                	} else {
-                		CONTENTVIEW.screenMove();
-                	}
-                }
-            	
+            	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);
+
+                    /* store old page */
+                    var dataJump = ClientData.JumpQueue();
+                    dataJump.push(CONTENTVIEW_CREATEOBJECT.moveContentParam.oldContent);
+                    ClientData.JumpQueue(dataJump);
+
+                    // update sid id
+                    ClientData.userInfo_sid(data.sid);
+                    ClientData.userInfo_sid_local(data.sid);
+                    //バックアップにも保持
+                    ClientData.userInfo_sid_local_bak(data.sid);
+
+                    if(ClientData.isStreamingMode()){
+                    	//ストリーミングのビューアへ移動
+                    	AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewStreaming);
+                    } else {
+                    	if (CONTENTVIEW_GENERAL.avwUserEnvObj.isMobile() && ClientData.isGetitsMode()) {
+                    		AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewGetits);
+                    	} else {
+                    		CONTENTVIEW.screenMove();
+                    	}
+                    }
+            	}
+
             }
             else {
                 $('#lblMessageLimitError').html(AVWEB.format(I18N.i18nText('msgLoginErrWrong'), data.errorMessage).toString()).show();