Author: agilliland
Date: Mon Jun 4 14:19:20 2007
New Revision: 544270
URL: http://svn.apache.org/viewvc?view=rev&rev=544270
Log:
fix for ROL-1423 which adds paging controls to the struts2 comment management
actions (global & weblog). these had gone missing during the struts2 migration.
Added:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/pagers/
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/pagers/CommentsPager.java
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagementBean.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CommentsBean.java
roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/GlobalCommentManagement.jsp
roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/Comments.jsp
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java?view=diff&rev=544270&r1=544269&r2=544270
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java
Mon Jun 4 14:19:20 2007
@@ -18,21 +18,26 @@
package org.apache.roller.weblogger.ui.struts2.admin;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
-import org.apache.commons.collections.ArrayStack;
+import java.util.Map;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.pojos.WeblogEntryComment;
+import org.apache.roller.weblogger.ui.struts2.pagers.CommentsPager;
import org.apache.roller.weblogger.ui.struts2.util.KeyValueObject;
import org.apache.roller.weblogger.util.cache.CacheManager;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
+import org.apache.roller.weblogger.util.URLUtilities;
import org.apache.roller.weblogger.util.Utilities;
@@ -43,11 +48,14 @@
private static Log log = LogFactory.getLog(GlobalCommentManagement.class);
+ // number of comments to show per page
+ private static final int COUNT = 2;
+
// bean for managing submitted data
private GlobalCommentManagementBean bean = new
GlobalCommentManagementBean();
- // list of comments to display
- private List comments = Collections.EMPTY_LIST;
+ // pager for the comments we are viewing
+ private CommentsPager pager = null;
// first comment in the list
private WeblogEntryComment firstComment = null;
@@ -55,15 +63,6 @@
// last comment in the list
private WeblogEntryComment lastComment = null;
- // are there more results for the query?
- private boolean moreResults = false;
-
- // link to previous page of results
- private String prevLink = null;
-
- // linke to next page of results
- private String nextLink = null;
-
// indicates number of comments that would be deleted by bulk removal
// a non-zero value here indicates bulk removal is a valid option
private int bulkDeleteCount = 0;
@@ -89,9 +88,11 @@
public void loadComments() {
+ List comments = Collections.EMPTY_LIST;
+ boolean hasMore = false;
try {
WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
- List comments = wmgr.getComments(
+ comments = wmgr.getComments(
null,
null,
getBean().getSearchString(),
@@ -99,27 +100,60 @@
getBean().getEndDate(),
getBean().getStatus(),
true, // reverse chrono order
- getBean().getOffset(),
- getBean().getCount() + 1);
+ getBean().getPage() * COUNT,
+ COUNT + 1);
if(comments != null && comments.size() > 0) {
- if(comments.size() > getBean().getCount()) {
+ if(comments.size() > COUNT) {
comments.remove(comments.size()-1);
- setMoreResults(true);
+ hasMore = true;
}
- setComments(comments);
setFirstComment((WeblogEntryComment)comments.get(0));
setLastComment((WeblogEntryComment)comments.get(comments.size()-1));
- loadNextPrevLinks(isMoreResults());
}
} catch (WebloggerException ex) {
log.error("Error looking up comments", ex);
// TODO: i18n
addError("Error looking up comments");
}
+
+ // build comments pager
+ String baseUrl = buildBaseUrl();
+ setPager(new CommentsPager(baseUrl, getBean().getPage(), comments,
hasMore));
+ }
+
+
+ // use the action data to build a url representing this action, including
query data
+ private String buildBaseUrl() {
+
+ Map<String, String> params = new HashMap();
+
+ SimpleDateFormat dojoFormat = new SimpleDateFormat("yyyy-MM-dd",
getLocale());
+ SimpleDateFormat stdFormat = new SimpleDateFormat("MM/dd/yy",
getLocale());
+
+ if(!StringUtils.isEmpty(getBean().getSearchString())) {
+ params.put("bean.searchString", getBean().getSearchString());
+ }
+ if(getBean().getStartDate() != null) {
+ params.put("bean.startDate",
stdFormat.format(getBean().getStartDate()));
+ params.put("dojo.bean.startDate",
dojoFormat.format(getBean().getStartDate()));
+ }
+ if(getBean().getEndDate() != null) {
+ params.put("bean.endDate",
stdFormat.format(getBean().getEndDate()));
+ params.put("dojo.bean.endDate",
dojoFormat.format(getBean().getEndDate()));
+ }
+ if(!StringUtils.isEmpty(getBean().getApprovedString())) {
+ params.put("bean.approvedString", getBean().getApprovedString());
+ }
+ if(!StringUtils.isEmpty(getBean().getSpamString())) {
+ params.put("bean.spamString", getBean().getSpamString());
+ }
+
+ return URLUtilities.getActionURL("globalCommentManagement",
"/roller-ui/admin",
+ null, params, false);
}
-
+
// show comment management page
public String execute() {
@@ -128,7 +162,7 @@
loadComments();
// load bean data using comments list
- getBean().loadCheckboxes(getComments());
+ getBean().loadCheckboxes(getPager().getItems());
return LIST;
}
@@ -143,7 +177,7 @@
loadComments();
// load bean data using comments list
- getBean().loadCheckboxes(getComments());
+ getBean().loadCheckboxes(getPager().getItems());
try {
WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
@@ -158,7 +192,7 @@
0,
-1);
- if(allMatchingComments.size() > getBean().getCount()) {
+ if(allMatchingComments.size() > COUNT) {
setBulkDeleteCount(allMatchingComments.size());
}
@@ -284,11 +318,6 @@
}
- private void loadNextPrevLinks(boolean moreResults) {
-
- }
-
-
public List getCommentStatusOptions() {
List opts = new ArrayList();
@@ -321,14 +350,6 @@
this.bean = bean;
}
- public List getComments() {
- return comments;
- }
-
- public void setComments(List comments) {
- this.comments = comments;
- }
-
public int getBulkDeleteCount() {
return bulkDeleteCount;
}
@@ -353,28 +374,12 @@
this.lastComment = lastComment;
}
- public String getPrevLink() {
- return prevLink;
- }
-
- public void setPrevLink(String prevLink) {
- this.prevLink = prevLink;
- }
-
- public String getNextLink() {
- return nextLink;
- }
-
- public void setNextLink(String nextLink) {
- this.nextLink = nextLink;
- }
-
- public boolean isMoreResults() {
- return moreResults;
+ public CommentsPager getPager() {
+ return pager;
}
- public void setMoreResults(boolean moreResults) {
- this.moreResults = moreResults;
+ public void setPager(CommentsPager pager) {
+ this.pager = pager;
}
}
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagementBean.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagementBean.java?view=diff&rev=544270&r1=544269&r2=544270
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagementBean.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagementBean.java
Mon Jun 4 14:19:20 2007
@@ -40,8 +40,7 @@
private Date endDate = null;
private String spamString = "ALL";
private String approvedString = "ALL";
- private int count = 30;
- private int offset = 0;
+ private int page = 0;
private String[] spamComments = new String[0];
private String[] deleteComments = new String[0];
@@ -93,22 +92,6 @@
}
- public int getCount() {
- return count;
- }
-
- public void setCount(int count) {
- this.count = count;
- }
-
- public int getOffset() {
- return offset;
- }
-
- public void setOffset(int offset) {
- this.offset = offset;
- }
-
public String getSpamString() {
return spamString;
}
@@ -171,6 +154,22 @@
public void setDeleteComments(String[] deleteComments) {
this.deleteComments = deleteComments;
+ }
+
+ public String getApprovedString() {
+ return approvedString;
+ }
+
+ public void setApprovedString(String approvedString) {
+ this.approvedString = approvedString;
+ }
+
+ public int getPage() {
+ return page;
+ }
+
+ public void setPage(int page) {
+ this.page = page;
}
}
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java?view=diff&rev=544270&r1=544269&r2=544270
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java
Mon Jun 4 14:19:20 2007
@@ -18,11 +18,15 @@
package org.apache.roller.weblogger.ui.struts2.editor;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collection;
import java.util.Collections;
-import java.util.Iterator;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
@@ -30,9 +34,11 @@
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.pojos.WeblogEntryComment;
import org.apache.roller.weblogger.pojos.WeblogPermission;
+import org.apache.roller.weblogger.ui.struts2.pagers.CommentsPager;
import org.apache.roller.weblogger.ui.struts2.util.KeyValueObject;
import org.apache.roller.weblogger.util.cache.CacheManager;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
+import org.apache.roller.weblogger.util.URLUtilities;
import org.apache.roller.weblogger.util.Utilities;
@@ -43,11 +49,14 @@
private static Log log = LogFactory.getLog(Comments.class);
+ // number of comments to show per page
+ private static final int COUNT = 2;
+
// bean for managing submitted data
private CommentsBean bean = new CommentsBean();
- // list of comments to display
- private List comments = Collections.EMPTY_LIST;
+ // pager for the comments we are viewing
+ private CommentsPager pager = null;
// first comment in the list
private WeblogEntryComment firstComment = null;
@@ -55,15 +64,6 @@
// last comment in the list
private WeblogEntryComment lastComment = null;
- // are there more results for the query?
- private boolean moreResults = false;
-
- // link to previous page of results
- private String prevLink = null;
-
- // linke to next page of results
- private String nextLink = null;
-
// indicates number of comments that would be deleted by bulk removal
// a non-zero value here indicates bulk removal is a valid option
private int bulkDeleteCount = 0;
@@ -84,9 +84,11 @@
public void loadComments() {
+ List comments = Collections.EMPTY_LIST;
+ boolean hasMore = false;
try {
WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
- List comments = wmgr.getComments(
+ comments = wmgr.getComments(
getActionWeblog(),
null,
getBean().getSearchString(),
@@ -94,27 +96,60 @@
getBean().getEndDate(),
getBean().getStatus(),
true, // reverse chrono order
- getBean().getOffset(),
- getBean().getCount() + 1);
+ getBean().getPage() * COUNT,
+ COUNT + 1);
if(comments != null && comments.size() > 0) {
- if(comments.size() > getBean().getCount()) {
+ if(comments.size() > COUNT) {
comments.remove(comments.size()-1);
- setMoreResults(true);
+ hasMore = true;
}
- setComments(comments);
setFirstComment((WeblogEntryComment)comments.get(0));
setLastComment((WeblogEntryComment)comments.get(comments.size()-1));
- loadNextPrevLinks(isMoreResults());
}
} catch (WebloggerException ex) {
log.error("Error looking up comments", ex);
// TODO: i18n
addError("Error looking up comments");
}
+
+ // build comments pager
+ String baseUrl = buildBaseUrl();
+ setPager(new CommentsPager(baseUrl, getBean().getPage(), comments,
hasMore));
+ }
+
+
+ // use the action data to build a url representing this action, including
query data
+ private String buildBaseUrl() {
+
+ Map<String, String> params = new HashMap();
+
+ SimpleDateFormat dojoFormat = new SimpleDateFormat("yyyy-MM-dd",
getLocale());
+ SimpleDateFormat stdFormat = new SimpleDateFormat("MM/dd/yy",
getLocale());
+
+ if(!StringUtils.isEmpty(getBean().getSearchString())) {
+ params.put("bean.searchString", getBean().getSearchString());
+ }
+ if(getBean().getStartDate() != null) {
+ params.put("bean.startDate",
stdFormat.format(getBean().getStartDate()));
+ params.put("dojo.bean.startDate",
dojoFormat.format(getBean().getStartDate()));
+ }
+ if(getBean().getEndDate() != null) {
+ params.put("bean.endDate",
stdFormat.format(getBean().getEndDate()));
+ params.put("dojo.bean.endDate",
dojoFormat.format(getBean().getEndDate()));
+ }
+ if(!StringUtils.isEmpty(getBean().getApprovedString())) {
+ params.put("bean.approvedString", getBean().getApprovedString());
+ }
+ if(!StringUtils.isEmpty(getBean().getSpamString())) {
+ params.put("bean.spamString", getBean().getSpamString());
+ }
+
+ return URLUtilities.getActionURL("comments", "/roller-ui/authoring",
+ getActionWeblog().getHandle(), params, false);
}
-
+
public String execute() {
@@ -122,7 +157,7 @@
loadComments();
// load bean data using comments list
- getBean().loadCheckboxes(getComments());
+ getBean().loadCheckboxes(getPager().getItems());
return LIST;
}
@@ -137,7 +172,7 @@
loadComments();
// load bean data using comments list
- getBean().loadCheckboxes(getComments());
+ getBean().loadCheckboxes(getPager().getItems());
try {
WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
@@ -152,7 +187,7 @@
0,
-1);
- if(allMatchingComments.size() > getBean().getCount()) {
+ if(allMatchingComments.size() > COUNT) {
setBulkDeleteCount(allMatchingComments.size());
}
@@ -303,11 +338,6 @@
}
- private void loadNextPrevLinks(boolean moreResults) {
-
- }
-
-
public List getCommentStatusOptions() {
List opts = new ArrayList();
@@ -340,14 +370,6 @@
this.bean = bean;
}
- public List getComments() {
- return comments;
- }
-
- public void setComments(List comments) {
- this.comments = comments;
- }
-
public int getBulkDeleteCount() {
return bulkDeleteCount;
}
@@ -372,28 +394,12 @@
this.lastComment = lastComment;
}
- public String getPrevLink() {
- return prevLink;
- }
-
- public void setPrevLink(String prevLink) {
- this.prevLink = prevLink;
- }
-
- public String getNextLink() {
- return nextLink;
- }
-
- public void setNextLink(String nextLink) {
- this.nextLink = nextLink;
- }
-
- public boolean isMoreResults() {
- return moreResults;
+ public CommentsPager getPager() {
+ return pager;
}
- public void setMoreResults(boolean moreResults) {
- this.moreResults = moreResults;
+ public void setPager(CommentsPager pager) {
+ this.pager = pager;
}
}
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CommentsBean.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CommentsBean.java?view=diff&rev=544270&r1=544269&r2=544270
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CommentsBean.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CommentsBean.java
Mon Jun 4 14:19:20 2007
@@ -36,8 +36,7 @@
private Date endDate = null;
private String spamString = "ALL";
private String approvedString = "ALL";
- private int count = 30;
- private int offset = 0;
+ private int page = 0;
private String[] approvedComments = new String[0];
private String[] spamComments = new String[0];
@@ -97,22 +96,6 @@
}
- public int getCount() {
- return count;
- }
-
- public void setCount(int count) {
- this.count = count;
- }
-
- public int getOffset() {
- return offset;
- }
-
- public void setOffset(int offset) {
- this.offset = offset;
- }
-
public String getSpamString() {
return spamString;
}
@@ -183,6 +166,22 @@
public void setDeleteComments(String[] deleteComments) {
this.deleteComments = deleteComments;
+ }
+
+ public String getApprovedString() {
+ return approvedString;
+ }
+
+ public void setApprovedString(String approvedString) {
+ this.approvedString = approvedString;
+ }
+
+ public int getPage() {
+ return page;
+ }
+
+ public void setPage(int page) {
+ this.page = page;
}
}
Added:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/pagers/CommentsPager.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/pagers/CommentsPager.java?view=auto&rev=544270
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/pagers/CommentsPager.java
(added)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/pagers/CommentsPager.java
Mon Jun 4 14:19:20 2007
@@ -0,0 +1,100 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. The ASF licenses this file to You
+ * under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License. For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
+ */
+
+package org.apache.roller.weblogger.ui.struts2.pagers;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.roller.weblogger.pojos.WeblogEntryComment;
+import org.apache.roller.weblogger.util.URLUtilities;
+
+
+/**
+ * Paging through a collection of comments.
+ */
+public class CommentsPager {
+
+ private static final Log log = LogFactory.getLog(CommentsPager.class);
+
+ // the collection for the pager
+ private final List<WeblogEntryComment> items;
+
+ // base url for the pager
+ private final String baseUrl;
+
+ // what page we are on
+ private final int pageNum;
+
+ // are there more items?
+ private final boolean moreItems;
+
+
+ public CommentsPager(String url, int page, List<WeblogEntryComment>
comments, boolean hasMore) {
+ this.baseUrl = url;
+ this.pageNum = page;
+ this.items = comments;
+ this.moreItems = hasMore;
+ }
+
+
+ public String getNextLink() {
+ if(isMoreItems()) {
+ int nextPage = pageNum + 1;
+ Map<String, String> params = new HashMap();
+ params.put("bean.page", ""+nextPage);
+ return createURL(baseUrl, params);
+ }
+ return null;
+ }
+
+
+ public String getPrevLink() {
+ if (pageNum > 0) {
+ int prevPage = pageNum - 1;
+ Map<String, String> params = new HashMap();
+ params.put("bean.page", ""+prevPage);
+ return createURL(baseUrl, params);
+ }
+ return null;
+ }
+
+
+ private String createURL(String base, Map<String, String> params) {
+ String qString = URLUtilities.getQueryString(params);
+
+ if(base.indexOf("?") != -1) {
+ // if base url already has params them just append our query string
+ return base + "&" + qString.substring(1);
+ } else {
+ return base + qString;
+ }
+ }
+
+
+ public List<WeblogEntryComment> getItems() {
+ return items;
+ }
+
+ public boolean isMoreItems() {
+ return moreItems;
+ }
+
+}
Modified:
roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/GlobalCommentManagement.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/GlobalCommentManagement.jsp?view=diff&rev=544270&r1=544269&r2=544270
==============================================================================
---
roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/GlobalCommentManagement.jsp
(original)
+++
roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/GlobalCommentManagement.jsp
Mon Jun 4 14:19:20 2007
@@ -78,7 +78,7 @@
<p class="pagetip"><s:text name="commentManagement.globalTip" /></p>
-<s:if test="comments.isEmpty">
+<s:if test="pager.items.isEmpty">
<s:text name="commentManagement.noCommentsFound" />
</s:if>
@@ -105,7 +105,7 @@
<div style="float:left;">
<s:text name="commentManagement.nowShowing">
- <s:param value="comments.size()" />
+ <s:param value="pager.items.size()" />
</s:text>
</div>
<div style="float:right;">
@@ -120,30 +120,30 @@
<%-- Next / previous links --%>
<%-- ============================================================= --%>
- <s:if test="prevLink != null && nextLink != null">
+ <s:if test="pager.prevLink != null && pager.nextLink != null">
<br /><center>
«
- <a href='<s:property value="prevLink" />'>
+ <a href='<s:property value="pager.prevLink" />'>
<s:text name="commentManagement.prev" /></a>
- | <a href='<s:property value="nextLink" />'>
+ | <a href='<s:property value="pager.nextLink" />'>
<s:text name="commentManagement.next" /></a>
»
</center><br />
</s:if>
- <s:elseif test="prevLink != null">
+ <s:elseif test="pager.prevLink != null">
<br /><center>
«
- <a href='<s:property value="prevLink" />'>
+ <a href='<s:property value="pager.prevLink" />'>
<s:text name="commentManagement.prev" /></a>
| <s:text name="commentManagement.next" />
»
</center><br />
</s:elseif>
- <s:elseif test="nextLink != null">
+ <s:elseif test="pager.nextLink != null">
<br /><center>
«
<s:text name="commentManagement.prev" />
- | <a class="" href='<s:property value="nextLink" />'>
+ | <a class="" href='<s:property value="pager.nextLink" />'>
<s:text name="commentManagement.next" /></a>
»
</center><br />
@@ -222,7 +222,7 @@
<%-- Loop through comments --%>
<%-- ========================================================= --%>
-<s:iterator id="comment" value="comments" status="rowstatus">
+<s:iterator id="comment" value="pager.items" status="rowstatus">
<tr>
<td>
<%-- a bit funky to use checkbox list here, but using checkbox didn't
work for me :(
Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/Comments.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/Comments.jsp?view=diff&rev=544270&r1=544269&r2=544270
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/Comments.jsp (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/Comments.jsp Mon Jun 4
14:19:20 2007
@@ -80,7 +80,7 @@
<p class="pagetip"><s:text name="commentManagement.tip" /></p>
-<s:if test="comments.isEmpty">
+<s:if test="pager.items.isEmpty">
<s:text name="commentManagement.noCommentsFound" />
</s:if>
@@ -108,7 +108,7 @@
<div style="float:left;">
<s:text name="commentManagement.nowShowing">
- <s:param value="comments.size()" />
+ <s:param value="pager.items.size()" />
</s:text>
</div>
<div style="float:right;">
@@ -123,30 +123,30 @@
<%-- Next / previous links --%>
<%-- ============================================================= --%>
- <s:if test="prevLink != null && nextLink != null">
+ <s:if test="pager.prevLink != null && pager.nextLink != null">
<br /><center>
«
- <a href='<s:property value="prevLink" />'>
+ <a href='<s:property value="pager.prevLink" />'>
<s:text name="commentManagement.prev" /></a>
- | <a href='<s:property value="nextLink" />'>
+ | <a href='<s:property value="pager.nextLink" />'>
<s:text name="commentManagement.next" /></a>
»
</center><br />
</s:if>
- <s:elseif test="prevLink != null">
+ <s:elseif test="pager.prevLink != null">
<br /><center>
«
- <a href='<s:property value="prevLink" />'>
+ <a href='<s:property value="pager.prevLink" />'>
<s:text name="commentManagement.prev" /></a>
| <s:text name="commentManagement.next" />
»
</center><br />
</s:elseif>
- <s:elseif test="nextLink != null">
+ <s:elseif test="pager.nextLink != null">
<br /><center>
«
<s:text name="commentManagement.prev" />
- | <a class="" href='<s:property value="nextLink" />'>
+ | <a class="" href='<s:property value="pager.nextLink" />'>
<s:text name="commentManagement.next" /></a>
»
</center><br />
@@ -237,7 +237,7 @@
<%-- Loop through comments --%>
<%-- ========================================================= --%>
-<s:iterator id="comment" value="comments" status="rowstatus">
+<s:iterator id="comment" value="pager.items" status="rowstatus">
<tr>
<td>
<%-- a bit funky to use checkbox list here, but using checkbox didn't
work for me :(
