xlawrence 2005/04/15 11:32:02 CEST
Modified files: (Branch: JAHIA-4-1-BRANCH)
src/java/org/jahia/blogs/actions GetUserBlogsAction.java
Log:
Now ignores blog information of blog pages that have been deleted
Revision Changes Path
1.1.2.2 +11 -4
jahia/src/java/org/jahia/blogs/actions/GetUserBlogsAction.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/blogs/actions/GetUserBlogsAction.java.diff?r1=1.1.2.1&r2=1.1.2.2&f=h
Index: GetUserBlogsAction.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/blogs/actions/Attic/GetUserBlogsAction.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- GetUserBlogsAction.java 14 Apr 2005 13:30:11 -0000 1.1.2.1
+++ GetUserBlogsAction.java 15 Apr 2005 09:32:02 -0000 1.1.2.2
@@ -52,6 +52,8 @@
import org.jahia.services.pages.JahiaPageDefinition;
import org.jahia.services.pages.JahiaPageBaseService;
+import org.jahia.services.version.EntryLoadRequest;
+
import org.jahia.exceptions.JahiaException;
import java.util.Enumeration;
@@ -103,15 +105,20 @@
pageDef.getID());
Enumeration blogPagesIdEnum = blogPagesId.elements();
-
+
// For each page matching the Blog definition
while (blogPagesIdEnum.hasMoreElements()) {
- int blogPageId = ((Integer)
blogPagesIdEnum.nextElement()).intValue();
+ int blogPageId =
((Integer)blogPagesIdEnum.nextElement()).intValue();
- ContentPage blogContentPage = super.changePage(blogPageId);
+ ContentPage blogContentPage = super.changePage(blogPageId);
+
+ int deleteVersionID = blogContentPage.getDeleteVersionID();
+
+ // ignore all deleted pages
+ if ((deleteVersionID != -1)) continue;
JahiaPage blogPage =
- blogContentPage.getPage(jParams.getEntryLoadRequest(),
+ blogContentPage.getPage(jParams.getEntryLoadRequest(),
jParams.getOperationMode(), user);
if (blogPage != null) {
log.debug("Found blog ["+ blogPageId + "]: " +
