Author: tdraier
Date: Thu Sep 27 12:40:37 2007
New Revision: 18690
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18690&repname=
=3Djahia
Log:
fixed page move (JAHIA-2381)
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/ContentObj=
ectKey.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/ContentPag=
eKey.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/workflow/=
WorkflowService.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/Cont=
entObjectKey.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/content/ContentObjectKey.java&rev=3D18690&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/content/ContentObj=
ectKey.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/ContentObj=
ectKey.java Thu Sep 27 12:40:37 2007
@@ -96,9 +96,13 @@
public static void flushCache(ContentObject object) {
if (treeCache !=3D null && object !=3D null) {
if(object instanceof ContentPage) {
- ContentObjectKey.treeCache.remove("parent"+object.getObjec=
tKey());
+ String base =3D "parent" + object.getObjectKey() + "-";
+ treeCache.remove(base + EntryLoadRequest.STAGING_WORKFLOW_=
STATE);
+ treeCache.remove(base + EntryLoadRequest.ACTIVE_WORKFLOW_S=
TATE);
+ treeCache.remove(base + EntryLoadRequest.WAITING_WORKFLOW_=
STATE);
+ treeCache.remove(base + EntryLoadRequest.DELETED_WORKFLOW_=
STATE);
}
- ContentObjectKey.treeCache.remove("childs"+((ContentObjectKey)=
object.getObjectKey()).getParent(EntryLoadRequest.STAGED));
+ treeCache.remove("childs"+((ContentObjectKey)object.getObjectK=
ey()).getParent(EntryLoadRequest.STAGED));
}
}
}
\ No newline at end of file
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/Cont=
entPageKey.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/content/ContentPageKey.java&rev=3D18690&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/java/org/jahia/content/ContentPag=
eKey.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/ContentPag=
eKey.java Thu Sep 27 12:40:37 2007
@@ -95,7 +95,7 @@
=
public ContentObjectKey getParent(EntryLoadRequest request) {
checkCache();
- ContentObjectKey p =3D (ContentObjectKey) treeCache.get("parent"+t=
oString());
+ ContentObjectKey p =3D (ContentObjectKey) treeCache.get("parent"+t=
oString()+"-"+request.getWorkflowState());
if (p !=3D null) {
return p;
}
@@ -103,7 +103,7 @@
int parentPageFieldId =3D ServicesRegistry.getInstance().getJahiaP=
ageService().getParentPageFieldId(getIdInType(), request);
if (parentPageFieldId > 0) {
p =3D new ContentFieldKey(parentPageFieldId);
- treeCache.put("parent"+toString(), p);
+ treeCache.put("parent"+toString()+"-"+request.getWorkflowState=
(), p);
}
return p;
}
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/wor=
kflow/WorkflowService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/workflow/WorkflowService.java&rev=
=3D18690&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/workflow/=
WorkflowService.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/workflow/=
WorkflowService.java Thu Sep 27 12:40:37 2007
@@ -906,6 +906,12 @@
if (parent !=3D null && getMainLinkObject(parent).equals(k)) {
getLinkedContentObjects(parent, keys, linked, unlinked, fa=
lse, true);
}
+ if (object instanceof ContentPageKey) {
+ parent =3D object.getParent(EntryLoadRequest.CURRENT);
+ if (parent !=3D null && getMainLinkObject(parent).equals(k=
)) {
+ getLinkedContentObjects(parent, keys, linked, unlinked=
, false, true);
+ }
+ }
}
}
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
