You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2006/10/14 03:49:51 UTC
svn commit: r463879 -
/incubator/roller/trunk/src/org/apache/roller/ui/rendering/model/PreviewPageModel.java
Author: agilliland
Date: Fri Oct 13 18:49:49 2006
New Revision: 463879
URL: http://svn.apache.org/viewvc?view=rev&rev=463879
Log:
fix previewing. we only want the preview pager when we are previewing an entry, otherwise we want the standard latest entries pager.
Modified:
incubator/roller/trunk/src/org/apache/roller/ui/rendering/model/PreviewPageModel.java
Modified: incubator/roller/trunk/src/org/apache/roller/ui/rendering/model/PreviewPageModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/rendering/model/PreviewPageModel.java?view=diff&rev=463879&r1=463878&r2=463879
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/rendering/model/PreviewPageModel.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/model/PreviewPageModel.java Fri Oct 13 18:49:49 2006
@@ -21,6 +21,7 @@
import java.util.Map;
import org.apache.roller.RollerException;
import org.apache.roller.pojos.wrapper.WeblogEntryDataWrapper;
+import org.apache.roller.ui.rendering.pagers.WeblogEntriesLatestPager;
import org.apache.roller.ui.rendering.pagers.WeblogEntriesPager;
import org.apache.roller.ui.rendering.pagers.WeblogEntriesPreviewPager;
import org.apache.roller.ui.rendering.util.WeblogPreviewRequest;
@@ -87,15 +88,28 @@
anchor = previewRequest.getWeblogAnchor();
}
- return new WeblogEntriesPreviewPager(
- previewRequest.getWeblog(),
- previewRequest.getLocale(),
- previewRequest.getWeblogPageName(),
- anchor,
- previewRequest.getWeblogDate(),
- null,
- previewRequest.getTags(),
- previewRequest.getPageNum());
+ if (anchor != null) {
+ return new WeblogEntriesPreviewPager(
+ previewRequest.getWeblog(),
+ previewRequest.getLocale(),
+ previewRequest.getWeblogPageName(),
+ anchor,
+ previewRequest.getWeblogDate(),
+ null,
+ previewRequest.getTags(),
+ previewRequest.getPageNum());
+ } else {
+ return new WeblogEntriesLatestPager(
+ previewRequest.getWeblog(),
+ previewRequest.getLocale(),
+ previewRequest.getWeblogPageName(),
+ previewRequest.getWeblogAnchor(),
+ previewRequest.getWeblogDate(),
+ null,
+ previewRequest.getTags(),
+ previewRequest.getPageNum());
+ }
+
}
}