diff --git a/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar b/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar index 40e3a0a9..0fe32f6b 100644 Binary files a/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar and b/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar differ diff --git a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java index 9d35d9fd..23eb877a 100644 --- a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java +++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java @@ -2995,7 +2995,7 @@ public class ProcessPublishWeb extends ActionWeb { JSONObject jb = new JSONObject(); PALRepositoryModel pModel=PALRepositoryCache.getCache().get(relatedRowMap.get(j).getString("RELATIONFILEID")); if(pModel!=null){ - String url=SDK.getConfAPI().getPortalUrl() + "/r/w?uuid="+ pModel.getId()+"&teamId=&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer&sid="+_uc.getSessionId(); + String url=SDK.getConfAPI().getPortalUrl() + "/r/w?uuid="+ pModel.getId()+"&teamId=&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer&sid="+_uc.getSessionId() + "&browserId=" + UUIDGener.getObjectId(); jb.put("relatedName",pModel.getName()); jb.put("relatedUrl",url); jsonArray1.add(jb.toJSONString()); @@ -3246,7 +3246,7 @@ public class ProcessPublishWeb extends ActionWeb { JSONObject jb = new JSONObject(); PALRepositoryModel pModel=PALRepositoryCache.getCache().get(relatedRowMap.get(b).getString("RELATIONFILEID")); if(pModel!=null){ - String url=SDK.getConfAPI().getPortalUrl() + "/r/w?uuid="+ pModel.getId()+"&teamId=&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer&sid="+_uc.getSessionId(); + String url=SDK.getConfAPI().getPortalUrl() + "/r/w?uuid="+ pModel.getId()+"&teamId=&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer&sid="+_uc.getSessionId() + "&browserId=" + UUIDGener.getObjectId(); jb.put("relatedName",pModel.getName()); jb.put("relatedUrl",url); jsonArray1.add(jb.toJSONString()); @@ -3525,7 +3525,7 @@ public class ProcessPublishWeb extends ActionWeb { JSONObject jb = new JSONObject(); PALRepositoryModel pModel=PALRepositoryCache.getCache().get(relatedRowMap.get(b).getString("RELATIONFILEID ")); if(pModel!=null){ - String url=SDK.getConfAPI().getPortalUrl() + "/r/w?uuid="+pModel.getId()+"&teamId=&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer&sid="+_uc.getSessionId(); + String url=SDK.getConfAPI().getPortalUrl() + "/r/w?uuid="+pModel.getId()+"&teamId=&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer&sid="+_uc.getSessionId() + "&browserId=" + UUIDGener.getObjectId(); jb.put("relatedName",pModel.getName()); jb.put("relatedUrl",url); jsonArray1.add(jb.toJSONString()); @@ -4009,7 +4009,7 @@ public class ProcessPublishWeb extends ActionWeb { JSONObject jb = new JSONObject(); PALRepositoryModel pModel=PALRepositoryCache.getCache().get(relatedRowMap.get(j).getString("RELATIONFILEID")); if(pModel!=null){ - String url=SDK.getConfAPI().getPortalUrl() + "/r/w?uuid="+ pModel.getId()+"&teamId=&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer&sid="+_uc.getSessionId(); + String url=SDK.getConfAPI().getPortalUrl() + "/r/w?uuid="+ pModel.getId()+"&teamId=&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer&sid="+_uc.getSessionId() + "&browserId=" + UUIDGener.getObjectId(); jb.put("relatedName",pModel.getName()); jb.put("relatedUrl",url); jsonArray1.add(jb.toJSONString()); @@ -5407,7 +5407,7 @@ public class ProcessPublishWeb extends ActionWeb { PALRepositoryModel pModel=PALRepositoryCache.getCache().get(relatedRowMap.get(i).getString("RELATIONFILEID")); if(pModel!=null){ String sessionId = new SSOUtil().registerClientSessionNoPassword("admin", LoginConst.DEFAULT_LANG, "localhost", LoginConst.DEVICE_PC); - String url=SDK.getConfAPI().getPortalUrl() + "/r/w?uuid="+ pModel.getId()+"&teamId=&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer&sid="+sessionId; + String url=SDK.getConfAPI().getPortalUrl() + "/r/w?uuid="+ pModel.getId()+"&teamId=&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer&sid="+sessionId + "&browserId=" + UUIDGener.getObjectId(); jb.put("relatedName",pModel.getName()); jb.put("relatedUrl",url); jsonArray1.add(jb.toJSONString()); diff --git a/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.process.publish.js b/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.process.publish.js index 58583892..887d3d8c 100644 --- a/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.process.publish.js +++ b/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.process.publish.js @@ -201,9 +201,10 @@ var CoEProcessPublish = { var nodeObj = nodes[index]; if (nodeObj.id.length > 16) { order++; + var browserId = (Math.random() + new Date().getTime()).toString(16).replace(".", ""); var hrefUrl = "./w?sid=" + $("#sid").val() + "&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer&uuid=" - + nodeObj.id + "&openType=0&openAppType=1"; + + nodeObj.id + "&openType=0&openAppType=1&browserId=" + browserId; var content = '