Author: shuber Date: Fri Oct 12 15:53:00 2007 New Revision: 18855 URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18855&repname= =3Djahia Log: Fix JAHIA-2442 (Migration SP2 to SP3 with MSServer, seems to work but with = a lot of exceptions) =
and some cosmetic fix for IE http://www.jahia.net/jira/browse/JAHIA-2442 Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/ProcessingC= ontext.java branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/p= atch_list.jsp Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/Proce= ssingContext.java URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/java/org/jahia/params/ProcessingContext.java&rev=3D18855&r= epname=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/params/ProcessingC= ontext.java (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/ProcessingC= ontext.java Fri Oct 12 15:53:00 2007 @@ -1332,7 +1332,11 @@ pageID =3D pageProperty.getPageID(); } } - setContentPage(ContentPage.getPage(pageID)); + if (pageID > 0) { + setContentPage(ContentPage.getPage(pageID)); + } else { + setContentPage(getSite().getHomeContentPage()); + } } = protected void setSiteInfoFromSiteFound() { Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administra= tion/patch_list.jsp URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/webapp/jsp/jahia/administration/patch_list.jsp&rev=3D18855= &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/administration/p= atch_list.jsp (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/p= atch_list.jsp Fri Oct 12 15:53:00 2007 @@ -160,7 +160,7 @@ <c:forEach items=3D"${availablePatches}" var=3D"patch" var= Status=3D"patchStatus"> <tr class=3D"<c:if test=3D'${patchStatus.index % 2 =3D= =3D 0}'>oddLine</c:if>"> <td><c:out value=3D"${patch.key.name}"/></td> - <td><img id=3D"<c:out value=3D'${patch.key.name}'/= >Icon" /></td><td><div id=3D"<c:out value=3D'${patch.key.name}'/>Status"></= div></div><div id=3D"<c:out value=3D'${patch.key.name}'/>Percent"></div></t= d> + <td><img id=3D"<c:out value=3D'${patch.key.name}'/= >Icon" src=3D"<%=3Drequest.getContextPath()%>/jsp/jahia/engines/images/pix.= gif" /></td><td><div id=3D"<c:out value=3D'${patch.key.name}'/>Status"></di= v></div><div id=3D"<c:out value=3D'${patch.key.name}'/>Percent"></div></td> </tr> </c:forEach> </table> _______________________________________________ cvs_list mailing list [email protected] http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
