Author: bpapez
Date: Mon Jan 7 11:55:12 2008
New Revision: 19460
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19460&repname=
=3Djahia
Log:
Fixed JSP compiling exceptions
Modified:
trunk/core/src/webapp/jsp/jahia/engines/selectpage/select_page.jsp
trunk/core/src/webapp/jsp/jahia/engines/timebasedpublishing/rangerule.j=
sp
Modified: trunk/core/src/webapp/jsp/jahia/engines/selectpage/select_page.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/selectpage/select_page.jsp&rev=3D19460&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/selectpage/select_page.jsp (ori=
ginal)
+++ trunk/core/src/webapp/jsp/jahia/engines/selectpage/select_page.jsp Mon =
Jan 7 11:55:12 2008
@@ -66,11 +66,11 @@
return;
}
if ( retRule.getInherited().booleanValue() && jahiaObjectDelegate.isVa=
lid() ){
- TimeBasedPublishingJahiaObject tbpObject =3D
- ((ContentPage)currentObject).getParentForTimeBasedPublishi=
ng(jParams.getUser(),
+ ObjectKey tbpObjectKey =3D
+ tbpService.getParentObjectKeyForTimeBasedPublishing(currentObj=
ect.getObjectKey(), jParams.getUser(),
jParams.getEntryLoadRequest(),jParams.getOperationMode());
- if ( tbpObject !=3D null ){
- currentObject =3D ContentObject.getContentObjectInstance(tbpObj=
ect.getObjectKey());
+ if ( tbpObjectKey !=3D null ){
+ currentObject =3D ContentObject.getContentObjectInstance(tbpObj=
ectKey);
jahiaObjectDelegate =3D
jahiaObjectManager.getJahiaObjectDelegate(currentObjec=
t.getObjectKey());
retRule =3D tbpService.getRetentionRule(currentObject.getObjec=
tKey());
Modified: trunk/core/src/webapp/jsp/jahia/engines/timebasedpublishing/range=
rule.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/timebasedpublishing/rangerule.jsp&rev=3D19460&repname=3D=
jahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/timebasedpublishing/rangerule.j=
sp (original)
+++ trunk/core/src/webapp/jsp/jahia/engines/timebasedpublishing/rangerule.j=
sp Mon Jan 7 11:55:12 2008
@@ -63,8 +63,8 @@
.getJahiaObjectDelegate(currentObjectKey);
currentRule =3D (BaseRetentionRule)tbpService.getRetentionRule=
(currentObjectKey);
if (currentRule !=3D null) {
- fromDateCalHandler.setDateLong(currentRule.getStartDate().=
longValue());
- toDateCalHandler.setDateLong(currentRule.getEndDate().long=
Value());
+ fromDateCalHandler.setDateLong(currentRule.getStartDate());
+ toDateCalHandler.setDateLong(currentRule.getEndDate());
}
}
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
