Author: sshyrkov Date: Wed Oct 17 14:17:59 2007 New Revision: 18896 URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18896&repname= =3Djahia Log: JAHIA-2470: SP3: url integrity checking on a delete action: you can update = destination field but could not come back to your delete engine on ok... =
http://www.jahia.net/jira/browse/JAHIA-2470 Resolution: the Update Container engine is opened now instead of the Update= Field engine Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/gui/GuiBean.java branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/deleteco= ntainer/deletecontainer.jsp Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/gui/GuiBean.= java URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/java/org/jahia/gui/GuiBean.java&rev=3D18896&repname=3Djahia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/gui/GuiBean.java (= original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/gui/GuiBean.java W= ed Oct 17 14:17:59 2007 @@ -483,7 +483,19 @@ */ public String drawUpdateContainerUrl(final ContentContainer contentCon= tainer) throws JahiaException { + return drawUpdateContainerUrl(contentContainer, 0); + } + + /** + * @param contentContainer + * @param focusedFieldId + * @return + * @throws JahiaException + */ + public String drawUpdateContainerUrl(final ContentContainer contentCon= tainer, int focusedFieldId) + throws JahiaException { final JahiaACLManagerService aclService =3D ServicesRegistry.getIn= stance().getJahiaACLManagerService(); + String url =3D ""; if (aclService.getSiteActionPermission("engines.actions.update", jParams.getUser(), JahiaBaseACL.READ_RIGHTS, jParams.getSiteID()) > 0 && @@ -491,10 +503,14 @@ jParams.getUser(), JahiaBaseACL.READ_RIGHTS, jParams.getSiteID()) > 0) { - return drawUrlCheckWriteAccess("updatecontainer", contentConta= iner); - } else { - return ""; + url =3D drawUrlCheckWriteAccess("updatecontainer", contentCont= ainer); + } + if (focusedFieldId > 0 && url.length() > 0) { + url =3D new StringBuffer(url.length() + 16).append(url).append( + "&fid=3D").append(focusedFieldId).toString(); } + = + return url; } = = Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/de= letecontainer/deletecontainer.jsp URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/webapp/jsp/jahia/engines/deletecontainer/deletecontainer.j= sp&rev=3D18896&repname=3Djahia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/deleteco= ntainer/deletecontainer.jsp (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/deleteco= ntainer/deletecontainer.jsp Wed Oct 17 14:17:59 2007 @@ -30,6 +30,7 @@ <%@ page import=3D"org.jahia.content.JahiaObject" %> <%@ page import=3D"org.jahia.services.acl.JahiaBaseACL" %> <%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %> +<[EMAIL PROTECTED] import=3D"org.jahia.services.containers.ContentContainer"%> <jahia:i18n/> = <% @@ -205,7 +206,13 @@ final boolean hasReadAccessToTargetPage =3D targetPage.che= ckReadAccess(jParams.getTheUser()); final String targetPageUrl =3D targetPage.getURL(jParams); final String targetPageTitle =3D targetPage.getTitle(jPara= ms.getEntryLoadRequest()); - final String updateFieldUrl =3D gui.drawUpdateFieldUrl(fie= ld); + String updateFieldUrl =3D gui.drawUpdateFieldUrl(field); + if (field.getContainerID() > 0) { + ContentContainer cnt =3D ContentContainer.getContainer= (field.getContainerID()); + if (cnt !=3D null) { + updateFieldUrl =3D gui.drawUpdateContainerUrl(cnt,= field.getID()); + } = + } final String newWindowName =3D "updateField_" + HTMLToolBo= x.cleanSessionID(jParams.getSessionID()); %> <tr> _______________________________________________ cvs_list mailing list [email protected] http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
