Author: bpapez
Date: Wed Jan 2 19:02:56 2008
New Revision: 19446
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19446&repname=
=3Djahia
Log:
Display the inherited TBP settings in the engine popup if the inheritance =
=3D true. If switching inheritance off, the fields are prefilled with the p=
reviously inherited settings (and not initialized, like up to now)
Modified:
trunk/core/src/java/org/jahia/engines/timebasedpublishing/TimeBasedPubl=
ishingEngine.java
trunk/core/src/webapp/jsp/jahia/engines/timebasedpublishing/calendar.jsp
trunk/core/src/webapp/jsp/jahia/engines/timebasedpublishing/enable_imme=
diatepublication.jsp
trunk/core/src/webapp/jsp/jahia/engines/timebasedpublishing/rangerule.j=
sp
Modified: trunk/core/src/java/org/jahia/engines/timebasedpublishing/TimeBas=
edPublishingEngine.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/engines/timebasedpublishing/TimeBasedPublishingEngine.java&rev=3D1=
9446&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/java/org/jahia/engines/timebasedpublishing/TimeBasedPubl=
ishingEngine.java (original)
+++ trunk/core/src/java/org/jahia/engines/timebasedpublishing/TimeBasedPubl=
ishingEngine.java Wed Jan 2 19:02:56 2008
@@ -17,6 +17,9 @@
*/
package org.jahia.engines.timebasedpublishing;
=
+import org.jahia.content.ContentContainerKey;
+import org.jahia.content.ContentContainerListKey;
+import org.jahia.content.ContentPageKey;
import org.jahia.content.ObjectKey;
import org.jahia.content.ContentObject;
import org.jahia.content.TimeBasedPublishingJahiaObject;
@@ -143,8 +146,9 @@
if (value !=3D null) {
rule.setRuleType(value);
}
-
- updateRuleRecurrenceSettings(rule, jParams, engineMap, subEngi=
neMap, objectKey);
+ if (!rule.getInherited().booleanValue()) {
+ updateRuleRecurrenceSettings(rule, jParams, engineMap, subEn=
gineMap, objectKey);
+ } =
}
=
value =3D jParams.getParameter("ruledefs");
@@ -444,27 +448,37 @@
logger.debug("new: " + rule);
if (isSame(oldRule,rule)) {
boolean applyParentState =3D false;
- if ( rule.getId().intValue() =3D=3D -1 ){
+ if (rule.getId().intValue() =3D=3D -1) {
// newly rule, we have to check on parent
try {
- ContentObject contentObject =3D ContentObject.getC=
ontentObjectInstance(objectKey);
- if ( contentObject instanceof TimeBasedPublishingJ=
ahiaObject ){
- TimeBasedPublishingJahiaObject parentObject =
=3D ((TimeBasedPublishingJahiaObject)contentObject)
- .getParentForTimeBasedPublishing(jPara=
ms.getUser(),jParams.getEntryLoadRequest(),
+ if (ContentPageKey.PAGE_TYPE
+ .equals(objectKey.getType())
+ || ContentContainerKey.CONTAINER_TYPE
+ .equals(objectKey.getType())
+ || ContentContainerListKey.CONTAINERLIST_T=
YPE
+ .equals(objectKey.getType())) {
+ ObjectKey parentObjectKey =3D tbpServ
+ .getParentObjectKeyForTimeBasedPublish=
ing(
+ objectKey, jParams.getUser(),
+ jParams.getEntryLoadRequest(),
jParams.getOperationMode());
- if ( parentObject !=3D null ){
- final JahiaObjectManager jahiaObjectManage=
r =3D
- (JahiaObjectManager) SpringContext=
Singleton.getInstance()
- .getContext().getBean(Jahi=
aObjectManager.class.getName());
+ if (parentObjectKey !=3D null) {
+ final JahiaObjectManager jahiaObjectManage=
r =3D (JahiaObjectManager) SpringContextSingleton
+ .getInstance().getContext().getBea=
n(
+ JahiaObjectManager.class
+ .getName());
JahiaObjectDelegate parentObjectDelegate =
=3D jahiaObjectManager
- .getJahiaObjectDelegate(parentObje=
ct.getObjectKey());
- if ( parentObjectDelegate.isNotValid() || =
parentObjectDelegate.isExpired()
- || parentObjectDelegate.willExpire=
(System.currentTimeMillis()) ){
+ .getJahiaObjectDelegate(parentObje=
ctKey);
+ if (parentObjectDelegate.isNotValid()
+ || parentObjectDelegate.isExpired()
+ || parentObjectDelegate
+ .willExpire(System
+ .currentTimeMillis=
())) {
applyParentState =3D true;
}
}
}
- } catch ( Throwable t ){
+ } catch (Throwable t) {
}
}
if( !applyParentState ){
Modified: trunk/core/src/webapp/jsp/jahia/engines/timebasedpublishing/calen=
dar.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/timebasedpublishing/calendar.jsp&rev=3D19446&repname=3Dj=
ahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/calendar.js=
p (original)
+++ trunk/core/src/webapp/jsp/jahia/engines/timebasedpublishing/calendar.js=
p Wed Jan 2 19:02:56 2008
@@ -127,7 +127,7 @@
<%
if ( !hiddenCalendar.booleanValue() ){
%> =
-<input class=3D"input" type=3D"text" name=3D"<%=3DcalHandler.getIdentifier=
()%>" id=3D"<%=3DcalHandler.getIdentifier()%>"
+<input class=3D"input dateInput" type=3D"text" name=3D"<%=3DcalHandler.get=
Identifier()%>" id=3D"<%=3DcalHandler.getIdentifier()%>"
size=3D"<%=3DtextSize%>" value=3D"" onChange=3D"setCal<%=3DcalHandl=
er.getIdentifier()%>()" disabled=3D"true">
<img src=3D"<%=3DcalHandler.getEngineHomeURL()%>/images/date.gif" alt=3D"<=
%=3DcalHandler.getIdentifier()%>Trigger"
id=3D"<%=3DcalHandler.getIdentifier()%>Trigger" style=3D"border: 0px =
solid red; cursor: pointer;" title=3D"Date selector"
Modified: trunk/core/src/webapp/jsp/jahia/engines/timebasedpublishing/enabl=
e_immediatepublication.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/timebasedpublishing/enable_immediatepublication.jsp&rev=
=3D19446&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/timebasedpublishing/enable_imme=
diatepublication.jsp (original)
+++ trunk/core/src/webapp/jsp/jahia/engines/timebasedpublishing/enable_imme=
diatepublication.jsp Wed Jan 2 19:02:56 2008
@@ -24,8 +24,8 @@
enableImmediatePublication =3D Boolean.TRUE;
}
%>
-<input class=3D"input" type=3D"radio" name=3D"enableImmediatePublication" =
value=3D"true" <%if(enableImmediatePublication.booleanValue()){%>checked<%}=
%>>
+<input class=3D"input immediatePublication" type=3D"radio" name=3D"enableI=
mmediatePublication" value=3D"true" <%if(enableImmediatePublication.boolean=
Value()){%>checked<%}%>>
<jahia:engineResourceBundle resourceName=3D"org.jahia.engines.timebasedpub=
lishing.allowedToStartImmediately" defaultValue=3D"allowed to start immedia=
tely"/><br/>
-<input class=3D"input" type=3D"radio" name=3D"enableImmediatePublication" =
value=3D"false" <%if(!enableImmediatePublication.booleanValue()){%>checked<=
%}%>>
+<input class=3D"input immediatePublication" type=3D"radio" name=3D"enableI=
mmediatePublication" value=3D"false" <%if(!enableImmediatePublication.boole=
anValue()){%>checked<%}%>>
<jahia:engineResourceBundle resourceName=3D"org.jahia.engines.timebasedpub=
lishing.onlyAtNextFullPeriod" defaultValue=3D"only at next full publish per=
iod"/>
=
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=3D19446&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 Wed Jan 2 19:02:56 2008
@@ -19,6 +19,15 @@
<%@ page import=3D"org.jahia.engines.timebasedpublishing.CalendarHandler" =
%>
<%@ page import=3D"org.jahia.engines.timebasedpublishing.TimeBasedPublishi=
ngEngine" %>
<%@ page import=3D"org.jahia.services.timebasedpublishing.*" %>
+<[EMAIL PROTECTED] import=3D"org.jahia.services.usermanager.JahiaUser"%>
+<[EMAIL PROTECTED] import=3D"org.jahia.services.usermanager.JahiaAdminUser"%>
+<[EMAIL PROTECTED] import=3D"org.jahia.hibernate.manager.JahiaObjectDelegate"%>
+<[EMAIL PROTECTED] import=3D"org.jahia.content.ObjectKey"%>
+<[EMAIL PROTECTED] import=3D"org.jahia.registries.ServicesRegistry"%>
+<[EMAIL PROTECTED] import=3D"org.jahia.services.version.EntryLoadRequest"%>
+<[EMAIL PROTECTED] import=3D"org.jahia.params.ParamBean"%>
+<[EMAIL PROTECTED]
import=3D"org.jahia.hibernate.manager.SpringContextSingleton"%>
+<[EMAIL PROTECTED] import=3D"org.jahia.hibernate.manager.JahiaObjectManager"%>
<%@ page import=3D"java.util.*" %>
<%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
<%@ taglib uri=3D"/WEB-INF/etc/taglibs/jstl/c" prefix=3D"c"%>
@@ -30,15 +39,37 @@
get(TimeBasedPublishingEngine.ENGINE_NAME + ".fromDateCalHandl=
er");
final CalendarHandler toDateCalHandler =3D (CalendarHandler) subEngine=
Map.
get(TimeBasedPublishingEngine.ENGINE_NAME + ".toDateCalHandler=
");
- final BaseRetentionRule currentRule =3D (BaseRetentionRule) subEngineM=
ap.
+ BaseRetentionRule currentRule =3D (BaseRetentionRule) subEngineMap.
get(TimeBasedPublishingEngine.ENGINE_NAME + ".currentRule");
Boolean enableImmediatePublication =3D (Boolean) subEngineMap.
get(TimeBasedPublishingEngine.ENGINE_NAME + ".enableImmediateP=
ublication"); =
- request.setAttribute("enableImmediatePublication", enableImmediatePubl=
ication);
if (currentRule !=3D null) {
inherited =3D currentRule.getInherited().booleanValue();
}
+ if (inherited =3D=3D true) {
+ JahiaObjectDelegate jahiaObjectDelegate =3D (JahiaObjectDelegate) =
subEngineMap.
+ get(TimeBasedPublishingEngine.ENGINE_NAME + ".jahiaObjectDeleg=
ate"); =
+ JahiaUser adminUser =3D JahiaAdminUser
+ .getAdminUser(jahiaObjectDelegate.getSiteId()
+ .intValue());
+ final TimeBasedPublishingService tbpService =3D ServicesRegistry.g=
etInstance().getTimeBasedPublishingService();
+ ObjectKey currentObjectKey =3D tbpService.getParentObjectKeyForTim=
eBasedPublishing(jahiaObjectDelegate.getObjectKey(),
+ adminUser, EntryLoadRequest.STAGED, ParamBean.EDIT, true);
+ if (currentObjectKey !=3D null) {
+ final JahiaObjectManager jahiaObjectManager =3D
+ (JahiaObjectManager) SpringContextSingleton.getInstance()
+ .getContext().getBean(JahiaObjectManager.class.getName=
());
+ jahiaObjectDelegate =3D jahiaObjectManager
+ .getJahiaObjectDelegate(currentObjectKey);
+ currentRule =3D (BaseRetentionRule)tbpService.getRetentionRule=
(currentObjectKey);
+ if (currentRule !=3D null) {
+ fromDateCalHandler.setDateLong(currentRule.getStartDate().=
longValue());
+ toDateCalHandler.setDateLong(currentRule.getEndDate().long=
Value());
+ }
+ }
+ }
request.setAttribute("currentRule", currentRule);
+ request.setAttribute("enableImmediatePublication", enableImmediatePubl=
ication); =
List ruleTypes =3D BaseRetentionRule.ruleTypes;
request.setAttribute("daysInWeek", currentRule.getDaysInWeek());
%>
@@ -48,15 +79,49 @@
if ( !els ){
return;
}
- if ( what =3D=3D true ){
- for ( i=3D0; i<els.length; i++ ){
- els[i].style.visibility=3D'hidden';
- } =
- } else {
- for ( i=3D0; i<els.length; i++ ){
- els[i].style.visibility=3D'visible';
- } =
- }
+ for ( i=3D0; i<els.length; i++ ){
+ var subels =3D els[i].getElementsByTagName("input");
+ for ( j=3D0; j<subels.length; j++ ){
+ if (subels[j].className.indexOf("immediatePublication") > -1) {
+ if (what =3D=3D true) {
+ els[i].style.visibility=3D'hidden';
+ } else {
+ els[i].style.visibility=3D'visible'; =
+ } =
+ break;
+ } else if (subels[j].className.indexOf("dateInput") =3D=3D -1)=
{ =
+ if (subels[j].type =3D=3D "checkbox" || subels[j].type =3D=
=3D "radio") {
+ subels[j].disabled=3Dwhat;
+ } else { =
+ subels[j].readOnly=3Dwhat;
+ } =
+ } =
+ }
+ subels =3D els[i].getElementsByTagName("textarea");
+ for ( j=3D0; j<subels.length; j++ ){
+ subels[j].readOnly=3Dwhat;
+ }
+ subels =3D els[i].getElementsByTagName("select");
+ for ( j=3D0; j<subels.length; j++ ){
+ subels[j].disabled=3Dwhat;
+ }
+ subels =3D els[i].getElementsByTagName("a");
+ for ( j=3D0; j<subels.length; j++ ){
+ if (what =3D=3D true) {
+ subels[j].style.visibility=3D'hidden';
+ } else {
+ subels[j].style.visibility=3D'visible'; =
+ } =
+ } =
+ subels =3D els[i].getElementsByTagName("img");
+ for ( j=3D0; j<subels.length; j++ ){
+ if (what =3D=3D true) {
+ subels[j].style.visibility=3D'hidden';
+ } else {
+ subels[j].style.visibility=3D'visible'; =
+ } =
+ } =
+ } =
}
</script>
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
