xlawrence 2005/04/15 19:14:41 CEST
Modified files: (Branch: JAHIA-4-1-BRANCH)
src/java/org/jahia/blogs/actions AbstractAction.java
EditPostAction.java
NewPostAction.java
Log:
Unpublished posts can now be retrieved by clients
Revision Changes Path
1.1.2.5 +15 -4
jahia/src/java/org/jahia/blogs/actions/AbstractAction.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/blogs/actions/AbstractAction.java.diff?r1=1.1.2.4&r2=1.1.2.5&f=h
1.1.2.4 +1 -1
jahia/src/java/org/jahia/blogs/actions/EditPostAction.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/blogs/actions/EditPostAction.java.diff?r1=1.1.2.3&r2=1.1.2.4&f=h
1.1.2.5 +2 -1 jahia/src/java/org/jahia/blogs/actions/NewPostAction.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/blogs/actions/NewPostAction.java.diff?r1=1.1.2.4&r2=1.1.2.5&f=h
Index: AbstractAction.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/blogs/actions/Attic/AbstractAction.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- AbstractAction.java 15 Apr 2005 15:30:43 -0000 1.1.2.4
+++ AbstractAction.java 15 Apr 2005 17:14:41 -0000 1.1.2.5
@@ -78,6 +78,8 @@
import org.jahia.params.ParamBean;
+import org.jahia.data.events.JahiaEvent;
+
import org.jahia.exceptions.JahiaException;
import org.apache.log4j.Logger;
@@ -223,8 +225,15 @@
*/
protected JahiaContainer getContainer(int id)
throws JahiaException {
+ EntryLoadRequest elr = new EntryLoadRequest(EntryLoadRequest.
+ STAGING_WORKFLOW_STATE,
+ 0,
+ jParams.getEntryLoadRequest().getLocales());
+
+ jParams.setSubstituteEntryLoadRequest(elr);
JahiaContainer postContainer = containerService.loadContainer(
- id, LoadFlags.ALL, jParams, EntryLoadRequest.STAGED);
+ id, LoadFlags.ALL, jParams, elr);
+ jParams.resetSubstituteEntryLoadRequest();
return postContainer;
}
@@ -239,8 +248,9 @@
EntryLoadRequest loadVersion = EntryLoadRequest.CURRENT;
if (servicesRegistry.getJahiaVersionService().
- isStagingEnabled(theContainer.getJahiaID()))
+ isStagingEnabled(theContainer.getJahiaID())) {
loadVersion = EntryLoadRequest.STAGED;
+ }
JahiaContainerList theList = containerService.
loadContainerListInfo(theContainer.
@@ -277,10 +287,11 @@
// since we have made modifications concerning this page, let's flush
// the content cache for all the users and browsers...
- if (htmlCache != null)
+ if (htmlCache != null) {
htmlCache.invalidatePageEntries(Integer.toString(
jParams.getPageID()).toString(),
jParams.getEntryLoadRequest().getWorkflowState());
+ }
}
/**
@@ -373,7 +384,7 @@
userName = author.getUsername();
}
- postInfo.put(PostInfo.USER_ID, userName);
+ postInfo.put(MetaPostInfo.USER_ID, userName);
postInfo.put(PostInfo.POST_ID,
Integer.toString(postContainer.getID()));
Index: EditPostAction.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/blogs/actions/Attic/EditPostAction.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- EditPostAction.java 14 Apr 2005 16:01:47 -0000 1.1.2.3
+++ EditPostAction.java 15 Apr 2005 17:14:41 -0000 1.1.2.4
@@ -125,7 +125,7 @@
// Load the Container and check the structure
final JahiaContainer postContainer = super.getContainer(Integer.
- parseInt(postID), "en");
+ parseInt(postID), jParams.getLocale().toString());
if (!postContainer.checkWriteAccess(user)) {
throw new JahiaException(
Index: NewPostAction.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/blogs/actions/Attic/NewPostAction.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- NewPostAction.java 15 Apr 2005 07:44:18 -0000 1.1.2.4
+++ NewPostAction.java 15 Apr 2005 17:14:41 -0000 1.1.2.5
@@ -178,7 +178,8 @@
log.debug("Saving Container for new Post: "+postContainer.getID());
// Load the Container and check the structure
- postContainer = super.getContainer(postContainer.getID(), "en");
+ postContainer = super.getContainer(postContainer.getID(),
+ jParams.getLocale().toString());
log.debug("Loaded and working on Container: "+postContainer.getID());
/* Set all the fields' value with the right data */
