tdraier 2005/10/18 18:09:50 CEST
Modified files:
core/src/java/org/jahia/engines/rights ManageRights.java
core/src/java/org/jahia/engines/updatecontainer
UpdateContainer_Engine.java
core/src/java/org/jahia/services/importexport
ImportHandler.java
Log:
fix
Revision Changes Path
1.16 +1 -1
jahia/core/src/java/org/jahia/engines/rights/ManageRights.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/rights/ManageRights.java.diff?r1=1.15&r2=1.16&f=h
1.32 +5 -4
jahia/core/src/java/org/jahia/engines/updatecontainer/UpdateContainer_Engine.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/updatecontainer/UpdateContainer_Engine.java.diff?r1=1.31&r2=1.32&f=h
1.28 +6 -0
jahia/core/src/java/org/jahia/services/importexport/ImportHandler.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/importexport/ImportHandler.java.diff?r1=1.27&r2=1.28&f=h
Index: ManageRights.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/rights/ManageRights.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ManageRights.java 13 Oct 2005 08:37:40 -0000 1.15
+++ ManageRights.java 18 Oct 2005 16:09:49 -0000 1.16
@@ -596,7 +596,7 @@
}
acl.setInheritance(currentInheritance);
-
+
resetCacheVariables();
return true;
Index: UpdateContainer_Engine.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/updatecontainer/UpdateContainer_Engine.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- UpdateContainer_Engine.java 12 Oct 2005 12:23:25 -0000 1.31
+++ UpdateContainer_Engine.java 18 Oct 2005 16:09:50 -0000 1.32
@@ -18,10 +18,7 @@
package org.jahia.engines.updatecontainer;
-import org.jahia.content.ContentContainerKey;
-import org.jahia.content.ContentContainerListsXRefManager;
-import org.jahia.content.ContentDefinition;
-import org.jahia.content.ObjectKey;
+import org.jahia.content.*;
import org.jahia.data.JahiaData;
import org.jahia.data.containers.*;
import org.jahia.data.events.JahiaEvent;
@@ -56,6 +53,7 @@
import org.jahia.services.lock.LockService;
import org.jahia.services.usermanager.JahiaUser;
import org.jahia.services.version.EntryLoadRequest;
+import org.jahia.services.workflow.WorkflowEvent;
import org.jahia.utils.LanguageCodeConverters;
import org.jahia.views.engines.contentdefinition.ContentDefinitionEngine;
import org.springframework.transaction.PlatformTransactionManager;
@@ -641,6 +639,9 @@
ManageRights.getInstance().handleActions(jParams, mode1,
engineMap, theContainer1.getAclID());
+ WorkflowEvent theEvent = new WorkflowEvent
(this, theContainer1.getContentContainer(), user,
ContentObject.SHARED_LANGUAGE, false);
+
ServicesRegistry.getInstance().getJahiaEventService().fireObjectChanged(theEvent);
+
// @todo FIXME we need to add code here that
flushes the cache
// of sub-pages if this container contains
one or more page
// fields. The entire page sub-structure
must be flushed for
Index: ImportHandler.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/importexport/ImportHandler.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ImportHandler.java 17 Oct 2005 15:28:02 -0000 1.27
+++ ImportHandler.java 18 Oct 2005 16:09:50 -0000 1.28
@@ -644,6 +644,12 @@
cp.commitChanges(true, true);
pageID = cp.getID();
}
+
+ if (object != null) {
+ setAcl(object, atts);
+ setMetadata(object, atts);
+ }
+
HtmlCache htmlCache =
ServicesRegistry.getInstance().getCacheService().getHtmlCacheInstance();
if (htmlCache != null) {
htmlCache.invalidatePageEntries(Integer.toString(pageID));
