Author: sshyrkov Date: Tue Jun 19 20:04:07 2007 New Revision: 17654 URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17654&repname= =3Djahia Log: JAHIA-1675: Sp2: delete a page which includes some cross-reference poiting = to it -> exception in the engine =
http://www.jahia.net/jira/browse/JAHIA-1675 JAHIA-1678: SP2: link available in order to edit the engine on the source p= age even if you do not have the edition permission on the source http://www.jahia.net/jira/browse/JAHIA-1678 Resolved: 1) Prevent opening second engine (NPE) 2) Display also a title for the target page 3) Check edit rights and do not display update container link, just contain= er name 4) Check read rights on the target page and do not display links, just page= ID and title Modified: trunk/core/src/conf/java/JahiaEnginesResources.properties trunk/core/src/conf/java/JahiaEnginesResources_de.properties trunk/core/src/conf/java/JahiaEnginesResources_en.properties trunk/core/src/conf/java/JahiaEnginesResources_es.properties trunk/core/src/conf/java/JahiaEnginesResources_fr.properties trunk/core/src/conf/java/JahiaEnginesResources_it.properties trunk/core/src/conf/java/JahiaEnginesResources_pt.properties trunk/core/src/webapp/jsp/jahia/engines/css/styles.css trunk/core/src/webapp/jsp/jahia/engines/deletecontainer/deletecontainer= .jsp Modified: trunk/core/src/conf/java/JahiaEnginesResources.properties URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j= ava/JahiaEnginesResources.properties&rev=3D17654&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 --- trunk/core/src/conf/java/JahiaEnginesResources.properties (original) +++ trunk/core/src/conf/java/JahiaEnginesResources.properties Tue Jun 19 20= :04:07 2007 @@ -629,6 +629,7 @@ org.jahia.engines.deletecontainer.DeleteContainer_Engine.name.label =3D Na= me org.jahia.engines.deletecontainer.DeleteContainer_Engine.onPageId.label = =3D on Page with ID org.jahia.engines.deletecontainer.DeleteContainer_Engine.pageId.label =3D = Page ID +org.jahia.engines.deletecontainer.DeleteContainer_Engine.pageTitle.label = =3D Page title org.jahia.engines.deletecontainer.DeleteContainer_Engine.subType.label =3D= Sub-type org.jahia.engines.deletecontainer.DeleteContainer_Engine.title.label =3D T= itle org.jahia.engines.deletecontainer.DeleteContainer_Engine.type.label =3D Ty= pe Modified: trunk/core/src/conf/java/JahiaEnginesResources_de.properties URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j= ava/JahiaEnginesResources_de.properties&rev=3D17654&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 --- trunk/core/src/conf/java/JahiaEnginesResources_de.properties (original) +++ trunk/core/src/conf/java/JahiaEnginesResources_de.properties Tue Jun 19= 20:04:07 2007 @@ -146,11 +146,12 @@ org.jahia.engines.deletecontainer.DeleteContainer_Engine.delLinks.label = =3D Die folgenden Links werden gel\u00F6scht org.jahia.engines.deletecontainer.DeleteContainer_Engine.delObj.label =3D = Jahia-Objekt l\u00F6schen und Fenster schlie\u00DFen. org.jahia.engines.deletecontainer.DeleteContainer_Engine.delPages.label = =3D Die folgenden Seiten werden gel\u00F6scht -org.jahia.engines.deletecontainer.DeleteContainer_Engine.futureBrokenLinks= .label =3D Die folgenden Content Objekte enthalten fest programmierte Links= zu gel\u00F6schtem Content. +org.jahia.engines.deletecontainer.DeleteContainer_Engine.futureBrokenLinks= .label =3D Die folgenden Content Objekte enthalten fest programmierte Links= zu gel\u00F6schtem Content org.jahia.engines.deletecontainer.DeleteContainer_Engine.id.label =3D ID org.jahia.engines.deletecontainer.DeleteContainer_Engine.name.label =3D Na= me org.jahia.engines.deletecontainer.DeleteContainer_Engine.onPageId.label = =3D auf der Seite mit der ID org.jahia.engines.deletecontainer.DeleteContainer_Engine.pageId.label =3D = Seiten-ID +org.jahia.engines.deletecontainer.DeleteContainer_Engine.pageTitle.label = =3D Seitentitel org.jahia.engines.deletecontainer.DeleteContainer_Engine.subType.label =3D= Untertyp org.jahia.engines.deletecontainer.DeleteContainer_Engine.title.label =3D T= itel org.jahia.engines.deletecontainer.DeleteContainer_Engine.type.label =3D Typ @@ -577,7 +578,7 @@ org.jahia.engines.updatefiled.UpdateField_Engine.fieldTitle.label =3D Feld= titel org.jahia.engines.updatefiled.UpdateField_Engine.fieldType.label =3D Feldt= yp org.jahia.engines.updatefiled.UpdateField_Engine.updateField.label =3D Fel= d aktualisieren -org.jahia.engines.updatefiled.UpdateField_Engine.rememberValidate.label = =3D <strong>Hinweis: </strong>Vergessen Sie nicht, die Seite zu validieren. +org.jahia.engines.updatefiled.UpdateField_Engine.rememberValidate.label = =3D <strong>Hinweis: </strong>Vergessen Sie nicht, die Seite zu validieren = ID: org.jahia.engines.updatefiled.UpdateField_Engine.toPublishContent.label = =3D um den Content zu ver\u00F6ffentlichen. org.jahia.engines.username.label =3D Benutzername org.jahia.engines.groupname.label =3D Gruppenname Modified: trunk/core/src/conf/java/JahiaEnginesResources_en.properties URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j= ava/JahiaEnginesResources_en.properties&rev=3D17654&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 --- trunk/core/src/conf/java/JahiaEnginesResources_en.properties (original) +++ trunk/core/src/conf/java/JahiaEnginesResources_en.properties Tue Jun 19= 20:04:07 2007 @@ -629,6 +629,7 @@ org.jahia.engines.deletecontainer.DeleteContainer_Engine.name.label =3D Na= me org.jahia.engines.deletecontainer.DeleteContainer_Engine.onPageId.label = =3D on Page with ID org.jahia.engines.deletecontainer.DeleteContainer_Engine.pageId.label =3D = Page ID +org.jahia.engines.deletecontainer.DeleteContainer_Engine.pageTitle.label = =3D Page title org.jahia.engines.deletecontainer.DeleteContainer_Engine.subType.label =3D= Sub-type org.jahia.engines.deletecontainer.DeleteContainer_Engine.title.label =3D T= itle org.jahia.engines.deletecontainer.DeleteContainer_Engine.type.label =3D Ty= pe Modified: trunk/core/src/conf/java/JahiaEnginesResources_es.properties URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j= ava/JahiaEnginesResources_es.properties&rev=3D17654&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 --- trunk/core/src/conf/java/JahiaEnginesResources_es.properties (original) +++ trunk/core/src/conf/java/JahiaEnginesResources_es.properties Tue Jun 19= 20:04:07 2007 @@ -150,6 +150,7 @@ org.jahia.engines.deletecontainer.DeleteContainer_Engine.id.label =3D ID org.jahia.engines.deletecontainer.DeleteContainer_Engine.name.label =3D No= mbre org.jahia.engines.deletecontainer.DeleteContainer_Engine.pageId.label =3D = ID de p\u00E1gina +org.jahia.engines.deletecontainer.DeleteContainer_Engine.pageTitle.label = =3D T\u00EDtulo de p\u00E1gina org.jahia.engines.deletecontainer.DeleteContainer_Engine.subType.label =3D= Subtipo org.jahia.engines.deletecontainer.DeleteContainer_Engine.title.label =3D T= \u00EDtulo org.jahia.engines.deletecontainer.DeleteContainer_Engine.type.label =3D Ti= po Modified: trunk/core/src/conf/java/JahiaEnginesResources_fr.properties URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j= ava/JahiaEnginesResources_fr.properties&rev=3D17654&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 --- trunk/core/src/conf/java/JahiaEnginesResources_fr.properties (original) +++ trunk/core/src/conf/java/JahiaEnginesResources_fr.properties Tue Jun 19= 20:04:07 2007 @@ -236,6 +236,7 @@ org.jahia.engines.deletecontainer.DeleteContainer_Engine.id.label =3D ID org.jahia.engines.deletecontainer.DeleteContainer_Engine.name.label =3D Nom org.jahia.engines.deletecontainer.DeleteContainer_Engine.pageId.label =3D = ID de la page +org.jahia.engines.deletecontainer.DeleteContainer_Engine.pageTitle.label = =3D Titre de la page org.jahia.engines.deletecontainer.DeleteContainer_Engine.subType.label =3D= Sous-type org.jahia.engines.deletecontainer.DeleteContainer_Engine.title.label =3D T= itre org.jahia.engines.deletecontainer.DeleteContainer_Engine.type.label =3D Ty= pe Modified: trunk/core/src/conf/java/JahiaEnginesResources_it.properties URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j= ava/JahiaEnginesResources_it.properties&rev=3D17654&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 --- trunk/core/src/conf/java/JahiaEnginesResources_it.properties (original) +++ trunk/core/src/conf/java/JahiaEnginesResources_it.properties Tue Jun 19= 20:04:07 2007 @@ -151,6 +151,7 @@ org.jahia.engines.deletecontainer.DeleteContainer_Engine.id.label =3D ID org.jahia.engines.deletecontainer.DeleteContainer_Engine.name.label =3D No= me org.jahia.engines.deletecontainer.DeleteContainer_Engine.pageId.label =3D = ID pagina +org.jahia.engines.deletecontainer.DeleteContainer_Engine.pageTitle.label = =3D Titolo pagina org.jahia.engines.deletecontainer.DeleteContainer_Engine.subType.label =3D= Sottotipo org.jahia.engines.deletecontainer.DeleteContainer_Engine.title.label =3D T= itolo org.jahia.engines.deletecontainer.DeleteContainer_Engine.type.label =3D Ti= po Modified: trunk/core/src/conf/java/JahiaEnginesResources_pt.properties URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j= ava/JahiaEnginesResources_pt.properties&rev=3D17654&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 --- trunk/core/src/conf/java/JahiaEnginesResources_pt.properties (original) +++ trunk/core/src/conf/java/JahiaEnginesResources_pt.properties Tue Jun 19= 20:04:07 2007 @@ -148,6 +148,7 @@ org.jahia.engines.deletecontainer.DeleteContainer_Engine.id.label =3D ID org.jahia.engines.deletecontainer.DeleteContainer_Engine.name.label =3D No= me org.jahia.engines.deletecontainer.DeleteContainer_Engine.pageId.label =3D = ID da P\u00E1gina +org.jahia.engines.deletecontainer.DeleteContainer_Engine.pageTitle.label = =3D T\u00EDtulo de p\u00E1gina = org.jahia.engines.deletecontainer.DeleteContainer_Engine.subType.label =3D= Subtipo org.jahia.engines.deletecontainer.DeleteContainer_Engine.title.label =3D T= \u00EDtulo org.jahia.engines.deletecontainer.DeleteContainer_Engine.type.label =3D Ti= po Modified: trunk/core/src/webapp/jsp/jahia/engines/css/styles.css URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp= /jsp/jahia/engines/css/styles.css&rev=3D17654&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 --- trunk/core/src/webapp/jsp/jahia/engines/css/styles.css (original) +++ trunk/core/src/webapp/jsp/jahia/engines/css/styles.css Tue Jun 19 20:04= :07 2007 @@ -289,6 +289,10 @@ text-align: center; } = +div.inMiddle table tr.header td { + white-space: nowrap; +} + .logs { width: 99%; font-size: 11px; Modified: trunk/core/src/webapp/jsp/jahia/engines/deletecontainer/deletecon= tainer.jsp URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp= /jsp/jahia/engines/deletecontainer/deletecontainer.jsp&rev=3D17654&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 --- trunk/core/src/webapp/jsp/jahia/engines/deletecontainer/deletecontainer= .jsp (original) +++ trunk/core/src/webapp/jsp/jahia/engines/deletecontainer/deletecontainer= .jsp Tue Jun 19 20:04:07 2007 @@ -28,17 +28,12 @@ <%@ page import=3D"org.jahia.services.fields.ContentField" %> <%@ page import=3D"org.jahia.content.ObjectKey" %> <%@ page import=3D"org.jahia.content.JahiaObject" %> -<%@ page import=3D"org.jahia.content.ContentObject" %> <%@ page import=3D"org.jahia.services.acl.JahiaBaseACL" %> <%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %> <jahia:i18n/> = -<jsp:useBean id=3D"jspSource" class=3D"java.lang.String" scope=3D"request"= /> - <% final HashMap engineMap =3D (HashMap) request.getAttribute("org.jahia.= engines.EngineHashMap"); - final String engineUrl =3D (String) engineMap.get("engineUrl"); - final String theScreen =3D (String) engineMap.get("screen"); final JahiaContainer theContainer =3D (JahiaContainer) engineMap.get("= theContainer"); final ParamBean jParams =3D (ParamBean) request.getAttribute("org.jahi= a.params.ParamBean"); = @@ -54,6 +49,11 @@ = <script type=3D"text/javascript"> window.onunload =3D closeTheWindow; + function refreshEngineWindow(theUrl, winName) { + window.name =3D winName; + window.location.href =3D theUrl; + return false; + } </script> = <h3 class=3D"delete"> @@ -176,7 +176,7 @@ = <div class=3D"inMiddle"> <table> - <tr> + <tr class=3D"header"> <td><strong><jahia:engineResourceBundle resourceName=3D"org.jahia.engines.deletecontainer.Dele= teContainer_Engine.type.label"/></strong></td> <td><strong><jahia:engineResourceBundle @@ -190,26 +190,44 @@ resourceName=3D"org.jahia.engines.deletecontainer.Dele= teContainer_Engine.title.label"/></strong></td> <td><strong><jahia:engineResourceBundle resourceName=3D"org.jahia.engines.deletecontainer.Dele= teContainer_Engine.pageId.label"/></strong></td> + <td><strong><jahia:engineResourceBundle + resourceName=3D"org.jahia.engines.deletecontainer.Dele= teContainer_Engine.pageTitle.label"/></strong></td> </tr> <% final Iterator brokenLinkObjectIter =3D futureBrokenLinkObject= s.iterator(); final GuiBean gui =3D new GuiBean(jParams); - final HTMLToolBox box =3D new HTMLToolBox(gui, jParams); while (brokenLinkObjectIter.hasNext()) { final HardcodedLinkSourceInfo curObject =3D (HardcodedLink= SourceInfo) brokenLinkObjectIter.next(); final ObjectKey objectKey =3D ObjectKey.getInstance(curObj= ect.getObjectType() + "_" + curObject.getID()); final JahiaObject jahiaObject =3D JahiaObject.getInstance(= objectKey); final ContentField field =3D (ContentField) jahiaObject; + final ContentPage targetPage =3D ContentPage.getPage(curOb= ject.getPageID(), false); + 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); + final String newWindowName =3D "updateField_" + HTMLToolBo= x.cleanSessionID(jParams.getSessionID()); %> <tr> <td><%=3DcurObject.getObjectType()%> </td> <td><%=3DcurObject.getObjectSubType()%> </td> <td><%=3DcurObject.getID()%> </td> - <td><a href=3D"javascript:<%=3Dbox.drawUpdateFieldLauncher(fie= ld)%>;"><%=3DcurObject.getName()%> </a></td> + <td> + <% if (updateFieldUrl.length() !=3D 0) { = + %><a href=3D"javascript:refreshEngineWindow('<%=3D updateField= Url %>', '<%=3D newWindowName %>')"><%=3DcurObject.getName()%></a><%} = + else = + {%><%=3DcurObject.getName()%><%}%> + </td> + = <td><%=3DcurObject.getTitle()%> </td> - <td><a target=3D"_blank" - href=3D"<%=3DContentPage.getPage(curObject.getPageID())= .getURL(jParams)%>"><%=3DcurObject.getPageID()%> - </a></td> + = + <% if (hasReadAccessToTargetPage) {%> + <td><a target=3D"_blank" href=3D"<%=3DtargetPageUrl%>"><%= =3DcurObject.getPageID()%></a> </td> + <td><a target=3D"_blank" href=3D"<%=3DtargetPageUrl%>"><%= =3D targetPageTitle %></a> </td> + <% } else { %> + <td><%=3DcurObject.getPageID()%> </td> + <td><%=3D targetPageTitle %> </td> + <% } %> </tr> <% } %> </table> _______________________________________________ cvs_list mailing list [email protected] http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
