Author: knguyen
Date: Tue Oct 9 12:53:49 2007
New Revision: 18793
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18793&repname=
=3Djahia
Log:
JAHIA-2460: It's not only a concern with time based publishing but with det=
ection of page properties changes.
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/pages/Page=
Properties_Engine.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/pages/Jah=
iaPage.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/page=
s/PageProperties_Engine.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/pages/PageProperties_Engine.java&re=
v=3D18793&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/engines/pages/Page=
Properties_Engine.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/pages/Page=
Properties_Engine.java Tue Oct 9 12:53:49 2007
@@ -24,6 +24,7 @@
package org.jahia.engines.pages;
=
import org.apache.log4j.Logger;
+import org.apache.commons.lang.builder.EqualsBuilder;
import org.jahia.content.ContentObject;
import org.jahia.content.ContentPageKey;
import org.jahia.content.ObjectKey;
@@ -608,6 +609,9 @@
=
final String pageKey =3D (String) engineMa=
p.get("dataPageURLKey");
=
+ String oldPageKey =3D thePage.getProperty(=
PageProperty.PAGE_URL_KEY_PROPNAME);
+ changed |=3D (oldPageKey=3D=3Dnull && page=
Key !=3D null) || (oldPageKey !=3D null && pageKey =3D=3D null)
+ || !oldPageKey.equals(pageKey);
if (pageKey !=3D null && pageKey.length() =
> 0) {
thePage.setProperty(PageProperty.PAGE_=
URL_KEY_PROPNAME,
pageKey);
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/pag=
es/JahiaPage.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/pages/JahiaPage.java&rev=3D18793&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/services/pages/Jah=
iaPage.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/pages/Jah=
iaPage.java Tue Oct 9 12:53:49 2007
@@ -627,9 +627,10 @@
*/
public boolean setPageTemplateID (int value)
throws JahiaException, JahiaTemplateNotFoundException {
+ boolean changed =3D this.getPageTemplateID() !=3D value;
mContentPage.setPageTemplateID (value, mEntryLoadRequest);
mPageTemplate =3D mContentPage.getPageTemplate(mEntryLoadRequest);
- return true;
+ return changed;
}
=
=
@@ -732,8 +733,25 @@
public final boolean setTitles (Set languagesSet, Hashtable titles)
throws JahiaException {
mContentPage.setTitles (languagesSet, titles, mEntryLoadRequest);
- title =3D null;
- return true;
+ Iterator it =3D languagesSet.iterator();
+ if ( this.getID() <=3D0 ){
+ return true;
+ }
+ boolean changed =3D false;
+ ContentPage contentPage =3D ContentPage.getPage(this.getID());
+ Hashtable lastUpdatedTitles =3D contentPage.getTitles(true);
+ String newTitle =3D null;
+ String title =3D null;
+ String lang =3D null;
+ while ( it.hasNext() ){
+ lang =3D (String)it.next();
+ newTitle =3D (String)titles.get(lang);
+ title =3D (String)lastUpdatedTitles.get(lang);
+ if ( !newTitle.equals(title) ){
+ return true;
+ }
+ }
+ return false;
}
=
/**
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
