#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,10 +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

@@ -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,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);
 
@@ -1467,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');
@@ -1521,7 +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);
 
@@ -1546,6 +1552,7 @@ CONTENTVIEW_CREATEOBJECT.createPwdRequiredTypeDialog = function(){
                     		CONTENTVIEW.screenMove();
                     	}
                     }
+            	}
 
             }
             else {