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/12/06 20:21:44 UTC
svn commit: r483183 - in
/incubator/roller/trunk/src/org/apache/roller/ui/rendering:
model/FeedModel.java pagers/CommentsPager.java
Author: agilliland
Date: Wed Dec 6 11:21:42 2006
New Revision: 483183
URL: http://svn.apache.org/viewvc?view=rev&rev=483183
Log:
there is no reason to put an endDate on comment queries being used for public display. there is no way for comments to be published into the future.
Modified:
incubator/roller/trunk/src/org/apache/roller/ui/rendering/model/FeedModel.java
incubator/roller/trunk/src/org/apache/roller/ui/rendering/pagers/CommentsPager.java
Modified: incubator/roller/trunk/src/org/apache/roller/ui/rendering/model/FeedModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/rendering/model/FeedModel.java?view=diff&rev=483183&r1=483182&r2=483183
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/rendering/model/FeedModel.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/model/FeedModel.java Wed Dec 6 11:21:42 2006
@@ -166,7 +166,7 @@
null, // weblog entry
null, // search String
null, // startDate
- new Date(), // endDate
+ null, // endDate
null, // pending
Boolean.TRUE, // approved only
Boolean.FALSE, // no spam
Modified: incubator/roller/trunk/src/org/apache/roller/ui/rendering/pagers/CommentsPager.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/rendering/pagers/CommentsPager.java?view=diff&rev=483183&r1=483182&r2=483183
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/rendering/pagers/CommentsPager.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/pagers/CommentsPager.java Wed Dec 6 11:21:42 2006
@@ -77,15 +77,20 @@
int offset = getPage() * length;
List results = new ArrayList();
- Calendar cal = Calendar.getInstance();
- cal.setTime(new Date());
- cal.add(Calendar.DATE, -1 * sinceDays);
- Date startDate = cal.getTime();
+
+ Date startDate = null;
+ if(sinceDays > 0) {
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(new Date());
+ cal.add(Calendar.DATE, -1 * sinceDays);
+ startDate = cal.getTime();
+ }
+
try {
Roller roller = RollerFactory.getRoller();
WeblogManager wmgr = roller.getWeblogManager();
List entries = wmgr.getComments(
- null, null, null, startDate, new Date(),
+ null, null, null, startDate, null,
null, Boolean.TRUE, Boolean.FALSE, true, offset, length + 1);
// check if there are more results for paging