Author: gmazza
Date: Sun Aug 18 18:08:58 2013
New Revision: 1515190
URL: http://svn.apache.org/r1515190
Log:
ROL-1596 fix off-by-one error in display of # of weblog entries.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/security/CustomUserRegistry.java
roller/trunk/app/src/main/webapp/themes/frontpage/Weblog.vm
roller/trunk/docs/examples/macros/site.vm
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/security/CustomUserRegistry.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/security/CustomUserRegistry.java?rev=1515190&r1=1515189&r2=1515190&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/security/CustomUserRegistry.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/security/CustomUserRegistry.java
Sun Aug 18 18:08:58 2013
@@ -29,7 +29,6 @@ import javax.servlet.http.HttpServletReq
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.ldap.userdetails.LdapUserDetails;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.config.WebloggerConfig;
Modified: roller/trunk/app/src/main/webapp/themes/frontpage/Weblog.vm
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/frontpage/Weblog.vm?rev=1515190&r1=1515189&r2=1515190&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/frontpage/Weblog.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/frontpage/Weblog.vm Sun Aug 18
18:08:58 2013
@@ -68,7 +68,7 @@
#end
#foreach($entry in $pager.items)
- #if($velocityCount < $maxResults)
+ #if($velocityCount <= $maxResults)
#includeTemplate($model.weblog "_entry")
#end
#end
Modified: roller/trunk/docs/examples/macros/site.vm
URL:
http://svn.apache.org/viewvc/roller/trunk/docs/examples/macros/site.vm?rev=1515190&r1=1515189&r2=1515190&view=diff
==============================================================================
--- roller/trunk/docs/examples/macros/site.vm (original)
+++ roller/trunk/docs/examples/macros/site.vm Sun Aug 18 18:08:58 2013
@@ -38,7 +38,7 @@ Show pager and next/prev control for sit
#set($endDate = $entries.get($entryCount).pubTime)
#end
#foreach($entry in $pager.items)
- #if($velocityCount < $maxResults)
+ #if($velocityCount <= $maxResults)
<div class="entry">
<p class="entryDetails">
