Author: knguyen
Date: Tue Aug 7 17:08:44 2007
New Revision: 18152
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18152&repname=
=3Djahia
Log:
display the type of recurrence in the time based publishing informational p=
opup.
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources.p=
roperties
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_e=
n.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/ajax/actionmenus/G=
etTimeBasedPublishingState.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/TimeBasedP=
ublishingJahiaObject.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/container=
s/ContentContainer.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/container=
s/ContentContainerList.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/pages/Con=
tentPage.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou=
rces.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaEnginesResources.properties&rev=3D18152&rep=
name=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/conf/java/JahiaEnginesResources.p=
roperties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources.p=
roperties Tue Aug 7 17:08:44 2007
@@ -1124,7 +1124,7 @@
org.jahia.engines.timebasedpublishing.days.mon =3D mon
org.jahia.engines.timebasedpublishing.days.tue =3D tue
org.jahia.engines.timebasedpublishing.days.wed =3D wed
-org.jahia.engines.timebasedpublishing.days.thu =3D tur
+org.jahia.engines.timebasedpublishing.days.thu =3D thu
org.jahia.engines.timebasedpublishing.days.fri =3D fri
org.jahia.engines.timebasedpublishing.days.sat =3D sat
org.jahia.engines.timebasedpublishing.days.sun =3D sun
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou=
rces_en.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaEnginesResources_en.properties&rev=3D18152&=
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/conf/java/JahiaEnginesResources_e=
n.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_e=
n.properties Tue Aug 7 17:08:44 2007
@@ -1124,7 +1124,7 @@
org.jahia.engines.timebasedpublishing.days.mon =3D mon
org.jahia.engines.timebasedpublishing.days.tue =3D tue
org.jahia.engines.timebasedpublishing.days.wed =3D wed
-org.jahia.engines.timebasedpublishing.days.thu =3D tur
+org.jahia.engines.timebasedpublishing.days.thu =3D thu
org.jahia.engines.timebasedpublishing.days.fri =3D fri
org.jahia.engines.timebasedpublishing.days.sat =3D sat
org.jahia.engines.timebasedpublishing.days.sun =3D sun
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/ajax/actionm=
enus/GetTimeBasedPublishingState.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/ajax/actionmenus/GetTimeBasedPublishingStat=
e.java&rev=3D18152&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/ajax/actionmenus/G=
etTimeBasedPublishingState.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/ajax/actionmenus/G=
etTimeBasedPublishingState.java Tue Aug 7 17:08:44 2007
@@ -22,10 +22,13 @@
import org.jahia.services.timebasedpublishing.RangeRetentionRule;
import org.jahia.services.timebasedpublishing.BaseRetentionRuleDef;
import org.jahia.services.usermanager.JahiaUser;
+import org.jahia.services.usermanager.JahiaAdminUser;
import org.jahia.services.sites.JahiaSite;
+import org.jahia.services.version.EntryLoadRequest;
import org.jahia.params.ProcessingContext;
import org.jahia.params.ParamBean;
import org.jahia.content.ContentObject;
+import org.jahia.content.TimeBasedPublishingJahiaObject;
import org.jahia.resourcebundle.JahiaResourceBundle;
import org.jahia.hibernate.manager.JahiaObjectDelegate;
import org.jahia.hibernate.manager.JahiaObjectManager;
@@ -215,6 +218,8 @@
jParams,jParams.getLocale(),"Time Based Publishing=
Status");
String currentStatusLabel =3D JahiaResourceBundle.getEngin=
eResource("org.jahia.engines.timebasedpublishing.currentstatus.label",
jParams,jParams.getLocale(),"Current status");
+ String schedulingTypeLabel =3D JahiaResourceBundle.getEngi=
neResource("org.jahia.engines.timebasedpublishing.schedulingType.label",
+ jParams,jParams.getLocale(),"Scheduling type");
String publicationDateLabel =3D JahiaResourceBundle.getEng=
ineResource("org.jahia.engines.timebasedpublishing.rangerule.validFrom.labe=
l",
jParams,jParams.getLocale(),"Publication date");
String expirationDateLabel =3D JahiaResourceBundle.getEngi=
neResource("org.jahia.engines.timebasedpublishing.rangerule.validTo.label",
@@ -222,12 +227,26 @@
String publicationDateValue =3D "";
String expirationDateValue =3D "";
String statusValueLabel =3D "";
+ String schedulingType =3D "";
if ( retRule !=3D null ){
boolean inherited =3D retRule.getInherited().booleanVa=
lue();
boolean isValid =3D jahiaObjectDelegate.isValid();
boolean isExpired =3D jahiaObjectDelegate.isExpired();
boolean willExpire =3D jahiaObjectDelegate.willExpire(=
now);
boolean willBecomeValid =3D jahiaObjectDelegate.willBe=
comeValid(now);
+ schedulingType =3D retRule.getRuleType();
+ if ( inherited ){
+ TimeBasedPublishingJahiaObject contentObject =3D (=
TimeBasedPublishingJahiaObject)ContentObject
+ .getContentObjectInstance(jahiaObjectDeleg=
ate.getObjectKey());
+ JahiaUser adminUser =3D JahiaAdminUser.getAdminUse=
r(jahiaObjectDelegate.getSiteId().intValue());
+ contentObject =3D contentObject
+ .getParentForTimeBasedPublishing(adminUser=
, EntryLoadRequest.STAGED,ParamBean.EDIT,true);
+ if ( contentObject !=3D null &&
+ !contentObject.getObjectKey().equals(jahia=
ObjectDelegate.getObjectKey()) ){
+ final RetentionRule effectiveRetRule =3D tbpSe=
rvice.getRetentionRule(contentObject.getObjectKey());
+ schedulingType =3D effectiveRetRule.getRuleTyp=
e();
+ }
+ }
int statusCode =3D 0;
if ( isExpired ){
statusCode =3D 0;
@@ -254,6 +273,9 @@
clientTimeZoneDiff =3D clientTimeZoneOffset * 60 *=
1000;
} catch ( Throwable t ){
}
+ schedulingType =3D JahiaResourceBundle
+ .getEngineResource("org.jahia.engines.timebase=
dpublishing.schedulingType."
+ +schedulingType,jParams,jParams.getLocale(),sc=
hedulingType);
=
RangeRetentionRule rangeRule =3D (RangeRetentionRule)r=
etRule;
Long dateLong =3D new Long(0);
@@ -283,6 +305,8 @@
StringBuffer buff =3D new StringBuffer("");
buff.append("<table class=3D\"timeBasedPublishingMainTable=
\" border=3D\"0\" cellpadding=3D\"0\" >");
buff.append("<tr>").append("<td colspan=3D\"3\" class=3D\"=
timeBasedPublishingTitle\" valign=3D\"top\" align=3D\"left\">").append(stat=
usLabel).append("</td>").append("</tr>");
+ buff.append("<tr>").append("<td class=3D\"timeBasedPublish=
ingLabel\" valign=3D\"top\" align=3D\"left\" nowrap>").append(schedulingTyp=
eLabel).append("</td><td valign=3D\"top\" align=3D\"left\" style=3D\"width:=
20px;text-aling:left\">:</td>");
+ buff.append("<td class=3D\"timeBasedPublishingValue\" vali=
gn=3D\"top\" align=3D\"left\" nowrap>").append(schedulingType).append("</td=
></tr>");
buff.append("<tr>").append("<td class=3D\"timeBasedPublish=
ingLabel\" valign=3D\"top\" align=3D\"left\" nowrap>").append(currentStatus=
Label).append("</td><td valign=3D\"top\" align=3D\"left\" style=3D\"width:2=
0px;text-aling:left\">:</td>");
buff.append("<td class=3D\"timeBasedPublishingValue\" vali=
gn=3D\"top\" align=3D\"left\" nowrap>").append(statusValueLabel).append("</=
td></tr>");
buff.append("<tr>").append("<td class=3D\"timeBasedPublish=
ingLabel\" valign=3D\"top\" align=3D\"left\" nowrap>").append(publicationDa=
teLabel).append("</td><td valign=3D\"top\" align=3D\"left\" style=3D\"width=
:20px;text-aling:left\">:</td>");
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/Time=
BasedPublishingJahiaObject.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/content/TimeBasedPublishingJahiaObject.java=
&rev=3D18152&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/content/TimeBasedP=
ublishingJahiaObject.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/TimeBasedP=
ublishingJahiaObject.java Tue Aug 7 17:08:44 2007
@@ -49,6 +49,21 @@
String operationMode) throws JahiaExceptio=
n;
=
/**
+ * Returns the parent of the current object
+ * @param user
+ * @param loadRequest
+ * @param operationMode
+ * @param withoutIneritedRule if true, returns the first parent that h=
as a rule that does not inherit.
+ *
+ * @return
+ * @throws JahiaException
+ */
+ public TimeBasedPublishingJahiaObject getParentForTimeBasedPublishing(=
JahiaUser user,
+ EntryLoadRequest loadRequest,
+ String operationMode,
+ boolean withoutIneritedRule) throws JahiaE=
xception;
+
+ /**
* This method is called to notify that time based publishing state ha=
s changed
*/
public void notifyStateChanged();
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/con=
tainers/ContentContainer.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/containers/ContentContainer.java&r=
ev=3D18152&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/services/container=
s/ContentContainer.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/container=
s/ContentContainer.java Tue Aug 7 17:08:44 2007
@@ -45,6 +45,7 @@
import org.jahia.services.usermanager.JahiaAdminUser;
import org.jahia.services.version.*;
import org.jahia.services.metadata.CoreMetadataConstant;
+import org.jahia.services.timebasedpublishing.RetentionRule;
import org.jahia.utils.LanguageCodeConverters;
import org.springframework.context.ApplicationContext;
=
@@ -1217,10 +1218,36 @@
public TimeBasedPublishingJahiaObject getParentForTimeBasedPublishing(=
JahiaUser user,
EntryLoadRequest loadRequest,
String operationMode) throws JahiaExceptio=
n{
- return this.getPage();
+ return getParentForTimeBasedPublishing(user,loadRequest,operationM=
ode,false);
}
=
/**
+ * Returns the parent of the current object for timebased publishing
+ */
+ public TimeBasedPublishingJahiaObject getParentForTimeBasedPublishing(=
JahiaUser user,
+ =
EntryLoadRequest loadRequest,
+ =
String operationMode,
+ =
boolean withoutInheritedRule)
+ throws JahiaException {
+ ContentObject contentObject =3D this.getPage();
+ if (!withoutInheritedRule){
+ return (TimeBasedPublishingJahiaObject)contentObject;
+ }
+ if ( contentObject !=3D null ){
+ final RetentionRule retRule =3D ServicesRegistry.getInstance()=
.getTimeBasedPublishingService()
+ .getRetentionRule(contentObject.getObjectKey());
+ if ( retRule !=3D null && !retRule.getInherited().booleanValue=
() ){
+ return (TimeBasedPublishingJahiaObject)contentObject;
+ }
+ return ((TimeBasedPublishingJahiaObject)contentObject)
+ .getParentForTimeBasedPublishing(user,loadRequest,oper=
ationMode,
+ withoutInheritedRule);
+ }
+ return null;
+ }
+
+
+ /**
* This method is called to notify that time based publishing state ha=
s changed
*/
public void notifyStateChanged(){
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/con=
tainers/ContentContainerList.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/containers/ContentContainerList.ja=
va&rev=3D18152&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/services/container=
s/ContentContainerList.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/container=
s/ContentContainerList.java Tue Aug 7 17:08:44 2007
@@ -37,6 +37,7 @@
import org.jahia.services.version.*;
import org.jahia.services.acl.JahiaBaseACL;
import org.jahia.services.acl.ACLNotFoundException;
+import org.jahia.services.timebasedpublishing.RetentionRule;
import org.jahia.utils.LanguageCodeConverters;
import org.springframework.context.ApplicationContext;
=
@@ -608,7 +609,32 @@
public TimeBasedPublishingJahiaObject getParentForTimeBasedPublishing(=
JahiaUser user,
EntryLoadRequest loadRequest,
String operationMode) throws JahiaExceptio=
n{
- return (TimeBasedPublishingJahiaObject)getParent(user,loadRequest,=
operationMode);
+ return getParentForTimeBasedPublishing(user,loadRequest,operationM=
ode,false);
+ }
+
+ /**
+ * Returns the parent of the current object for timebased publishing
+ */
+ public TimeBasedPublishingJahiaObject getParentForTimeBasedPublishing(=
JahiaUser user,
+ =
EntryLoadRequest loadRequest,
+ =
String operationMode,
+ =
boolean withoutInheritedRule)
+ throws JahiaException {
+ ContentObject contentObject =3D getParent(user,loadRequest,operati=
onMode);
+ if (!withoutInheritedRule){
+ return (TimeBasedPublishingJahiaObject)contentObject;
+ }
+ if ( contentObject !=3D null ){
+ final RetentionRule retRule =3D ServicesRegistry.getInstance()=
.getTimeBasedPublishingService()
+ .getRetentionRule(contentObject.getObjectKey());
+ if ( retRule !=3D null && !retRule.getInherited().booleanValue=
() ){
+ return (TimeBasedPublishingJahiaObject)contentObject;
+ }
+ return ((TimeBasedPublishingJahiaObject)contentObject)
+ .getParentForTimeBasedPublishing(user,loadRequest,oper=
ationMode,
+ withoutInheritedRule);
+ }
+ return null;
}
=
/**
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/pag=
es/ContentPage.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/pages/ContentPage.java&rev=3D18152=
&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/services/pages/Con=
tentPage.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/pages/Con=
tentPage.java Tue Aug 7 17:08:44 2007
@@ -50,6 +50,7 @@
import org.jahia.services.version.*;
import org.jahia.services.workflow.WorkflowEvent;
import org.jahia.services.workflow.WorkflowService;
+import org.jahia.services.timebasedpublishing.RetentionRule;
import org.jahia.utils.JahiaTools;
import org.jahia.utils.LanguageCodeConverters;
import org.jahia.utils.xml.XMLSerializationOptions;
@@ -4881,9 +4882,32 @@
public TimeBasedPublishingJahiaObject getParentForTimeBasedPublishing(=
JahiaUser user,
=
EntryLoadRequest loadRequest,
=
String operationMode) throws JahiaException {
+ return getParentForTimeBasedPublishing(user,loadRequest,operationM=
ode,false);
+ }
+
+ /**
+ * Returns the parent of the current object for timebased publishing
+ */
+ public TimeBasedPublishingJahiaObject getParentForTimeBasedPublishing(=
JahiaUser user,
+ =
EntryLoadRequest loadRequest,
+ =
String operationMode,
+ =
boolean withoutInheritedRule)
+ throws JahiaException {
ContentPageField pageField =3D (ContentPageField) this.getParent(u=
ser, loadRequest, operationMode);
if (pageField !=3D null) {
- return ContentContainer.getContainer(pageField.getContainerID(=
));
+ ContentContainer contentContainer =3D ContentContainer.getCont=
ainer(pageField.getContainerID());
+ if ( !withoutInheritedRule ){
+ return contentContainer;
+ }
+ if ( contentContainer !=3D null ){
+ final RetentionRule retRule =3D ServicesRegistry.getInstan=
ce().getTimeBasedPublishingService()
+ .getRetentionRule(contentContainer.getObjectKey());
+ if ( retRule !=3D null && !retRule.getInherited().booleanV=
alue() ){
+ return contentContainer;
+ }
+ return contentContainer.getParentForTimeBasedPublishing(us=
er,loadRequest,operationMode,
+ withoutInheritedRule);
+ }
}
return null;
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
