Update of /var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources In directory james.mmbase.org:/tmp/cvs-serv1083/cmsc/contentrepository/src/webapp/editors/resources
Modified Files: Tag: b1_5 imagesearch.jsp urlsearch.jsp attachmentsearch.jsp Log Message: CMSC-1132 Editors won't work when deployed on tomcat 5.5.27 See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources See also: http://www.mmbase.org/jira/browse/CMSC-1132 Index: imagesearch.jsp =================================================================== RCS file: /var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/imagesearch.jsp,v retrieving revision 1.11.2.2 retrieving revision 1.11.2.3 diff -u -b -r1.11.2.2 -r1.11.2.3 --- imagesearch.jsp 8 Oct 2008 07:04:51 -0000 1.11.2.2 +++ imagesearch.jsp 3 Jan 2009 18:01:12 -0000 1.11.2.3 @@ -89,7 +89,7 @@ <c:if test="${action != 'select'}"> <a href="<mm:url page="../WizardInitAction.do"> <mm:param name="objectnumber"><mm:field name="number" /></mm:param> - <mm:param name="returnurl" value="<%="../editors/resources/ImageAction.do" + request.getAttribute("geturl")%>" /> + <mm:param name="returnurl" value='<%="../editors/resources/ImageAction.do" + request.getAttribute("geturl")%>' /> </mm:url>"> <img src="../gfx/icons/page_edit.png" alt="<fmt:message key="imagesearch.icon.edit" />" title="<fmt:message key="imagesearch.icon.edit" />" /></a> <a href="javascript:showInfo(<mm:field name="number" />)"> @@ -98,7 +98,7 @@ <a href="<mm:url page="DeleteSecondaryContentAction.do" > <mm:param name="object_type" value="images"/> <mm:param name="objectnumber"><mm:field name="number" /></mm:param> - <mm:param name="returnurl" value="<%="/editors/resources/ImageAction.do" + request.getAttribute("geturl")%>" /> + <mm:param name="returnurl" value='<%="/editors/resources/ImageAction.do" + request.getAttribute("geturl")%>' /> </mm:url>"> <img src="../gfx/icons/delete.png" alt="<fmt:message key="imagesearch.icon.delete" />" title="<fmt:message key="imagesearch.icon.delete" />"/></a> </mm:hasrank> Index: urlsearch.jsp =================================================================== RCS file: /var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/urlsearch.jsp,v retrieving revision 1.12.2.2 retrieving revision 1.12.2.3 diff -u -b -r1.12.2.2 -r1.12.2.3 --- urlsearch.jsp 8 Oct 2008 07:04:51 -0000 1.12.2.2 +++ urlsearch.jsp 3 Jan 2009 18:01:12 -0000 1.12.2.3 @@ -74,7 +74,7 @@ <c:if test="${action != 'select'}"> <a href="<mm:url page="../WizardInitAction.do"> <mm:param name="objectnumber"><mm:field name="number" /></mm:param> - <mm:param name="returnurl" value="<%="../editors/resources/UrlAction.do" + request.getAttribute("geturl")%>" /> + <mm:param name="returnurl" value='<%="../editors/resources/UrlAction.do" + request.getAttribute("geturl")%>' /> </mm:url>"> <img src="../gfx/icons/page_edit.png" title="<fmt:message key="urlsearch.icon.edit" />" /></a> <a href="javascript:showInfo(<mm:field name="number" />,'<%="/editors/resources/UrlAction.do" + request.getAttribute("geturl")%>')"> @@ -83,7 +83,7 @@ <a href="<mm:url page="DeleteSecondaryContentAction.do" > <mm:param name="object_type" value="urls"/> <mm:param name="objectnumber"><mm:field name="number" /></mm:param> - <mm:param name="returnurl" value="<%="/editors/resources/UrlAction.do" + request.getAttribute("geturl")%>" /> + <mm:param name="returnurl" value='<%="/editors/resources/UrlAction.do" + request.getAttribute("geturl")%>' /> </mm:url>"> <img src="../gfx/icons/delete.png" title="<fmt:message key="urlsearch.icon.delete" />" /></a> </mm:hasrank> Index: attachmentsearch.jsp =================================================================== RCS file: /var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/attachmentsearch.jsp,v retrieving revision 1.12.2.1 retrieving revision 1.12.2.2 diff -u -b -r1.12.2.1 -r1.12.2.2 --- attachmentsearch.jsp 8 Oct 2008 07:04:51 -0000 1.12.2.1 +++ attachmentsearch.jsp 3 Jan 2009 18:01:12 -0000 1.12.2.2 @@ -81,7 +81,7 @@ <c:if test="${action != 'select'}"> <a href="<mm:url page="../WizardInitAction.do"> <mm:param name="objectnumber"><mm:field name="number" /></mm:param> - <mm:param name="returnurl" value="<%="../editors/resources/AttachmentAction.do" + request.getAttribute("geturl")%>" /> + <mm:param name="returnurl" value='<%="../editors/resources/AttachmentAction.do" + request.getAttribute("geturl")%>' /> </mm:url>"> <img src="../gfx/icons/page_edit.png" alt="<fmt:message key="attachmentsearch.icon.edit" />" title="<fmt:message key="attachmentsearch.icon.edit" />" /></a> <a href="javascript:showInfo(<mm:field name="number" />)"> @@ -90,7 +90,7 @@ <a href="<mm:url page="DeleteSecondaryContentAction.do" > <mm:param name="object_type" value="attachments"/> <mm:param name="objectnumber"><mm:field name="number" /></mm:param> - <mm:param name="returnurl" value="<%="/editors/resources/AttachmentAction.do" + request.getAttribute("geturl")%>" /> + <mm:param name="returnurl" value='<%="/editors/resources/AttachmentAction.do" + request.getAttribute("geturl")%>' /> </mm:url>"> <img src="../gfx/icons/delete.png" alt="<fmt:message key="attachmentsearch.icon.delete" />" title="<fmt:message key="attachmentsearch.icon.delete" />"/></a> </mm:hasrank> _______________________________________________ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs