diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/web/CoeDesignerWeb.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/web/CoeDesignerWeb.java index 9f636d36..4ffd5215 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/web/CoeDesignerWeb.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/web/CoeDesignerWeb.java @@ -3535,6 +3535,7 @@ public class CoeDesignerWeb extends ActionWeb { } ResponseObject ro = ResponseObject.newOkResponse(); CoeCooperationAPIManager.getInstance().queryCooperationMemberActionPerm(teamId, _uc.getUID(), ro); + CoeCooperationAPIManager.getInstance().queryCooperationFileActionPerm(teamId, _uc.getUID(),PALRepositoryCache.getCache().get(id).getVersionId(), ro); ro.put("isCorrelatebpms", false); ro.put("processDefId", ""); boolean isCorrelateBpms = PALRepositoryQueryAPIManager.getInstance().isCorrelateBpms(id, true); diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java index a4e1b482..44cf4265 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java @@ -4,6 +4,7 @@ import com.actionsoft.apps.AppPlatformConfig; import com.actionsoft.apps.AppsConst; import com.actionsoft.apps.coe.pal.cooperation.CoeCooperationAPIManager; import com.actionsoft.apps.coe.pal.cooperation.cache.CooperationCache; +import com.actionsoft.apps.coe.pal.cooperation.constant.CoeCooperationConst; import com.actionsoft.apps.coe.pal.datamigration.aris.model.ObjDefModel; import com.actionsoft.apps.coe.pal.datamigration.aris.model.ObjOccModel; import com.actionsoft.apps.coe.pal.datamigration.constant.Constant; @@ -9081,7 +9082,12 @@ public String deleteReply(String replyid, String messageid) { if (UtilString.isEmpty(teamId)) { batchAppVisible = true; } else { - batchAppVisible = CoeCooperationAPIManager.getInstance().havingWritePerm(teamId, _uc.getUID()); + if (SDK.getAppAPI().getPropertyBooleanValue("com.actionsoft.apps.coe.pal", "IsOlderVersion", true)){ + batchAppVisible = CoeCooperationAPIManager.getInstance().havingWritePerm(teamId, _uc.getUID()); + }else { + batchAppVisible = CooperationCache.getUserOperatePermission(teamId, _uc.getUID()).contains(CoeCooperationConst.ACTION_BATCH); + } + } batchDlg = HtmlPageTemplate.merge(CoEConstant.APP_BATCH_ID, "batch.dialog.htm", null); } diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/themes/default/diagraming/ui.css b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/themes/default/diagraming/ui.css index 812bc502..2db5aae1 100755 --- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/themes/default/diagraming/ui.css +++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/themes/default/diagraming/ui.css @@ -151,7 +151,7 @@ html{ background-position: 1px -637px; } .ico.resize{ - background-position: -20px -600px; + background-position: -20px -637px; } .ico.brush{ background-position: -20px -20px; diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/themes/default/images/diagraming/sprite.png b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/themes/default/images/diagraming/sprite.png old mode 100755 new mode 100644 index de008f0d..973a0947 Binary files a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/themes/default/images/diagraming/sprite.png and b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/themes/default/images/diagraming/sprite.png differ