Author: snoopdave
Date: Tue Aug 7 13:54:59 2007
New Revision: 563653
URL: http://svn.apache.org/viewvc?view=rev&rev=563653
Log:
Fix for http://opensource.atlassian.com/projects/roller/browse/ROL-1516
Same fix but for Global Comment Management
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java
roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/GlobalCommentManagementSidebar.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=563653&r1=563652&r2=563653
==============================================================================
---
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
Tue Aug 7 13:54:59 2007
@@ -90,7 +90,7 @@
boolean hasMore = false;
try {
WeblogManager wmgr =
WebloggerFactory.getWeblogger().getWeblogManager();
- comments = wmgr.getComments(
+ List rawComments = wmgr.getComments(
null,
null,
getBean().getSearchString(),
@@ -100,6 +100,8 @@
true, // reverse chrono order
getBean().getPage() * COUNT,
COUNT + 1);
+ comments = new ArrayList();
+ comments.addAll(rawComments);
if(comments != null && comments.size() > 0) {
if(comments.size() > COUNT) {
Modified:
roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/GlobalCommentManagementSidebar.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/GlobalCommentManagementSidebar.jsp?view=diff&rev=563653&r1=563652&r2=563653
==============================================================================
---
roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/GlobalCommentManagementSidebar.jsp
(original)
+++
roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/GlobalCommentManagementSidebar.jsp
Tue Aug 7 13:54:59 2007
@@ -85,7 +85,7 @@
<br />
</label>
<div>
- <s:radio theme="roller" name="approvedString"
list="commentStatusOptions" listKey="key" listValue="value" />
+ <s:radio theme="roller" name="bean.approvedString"
list="commentStatusOptions" listKey="key" listValue="value" />
</div>
</div>
<br />
@@ -99,7 +99,7 @@
<br />
</label>
<div>
- <s:radio theme="roller" name="spamString" list="spamStatusOptions"
listKey="key" listValue="value" />
+ <s:radio theme="roller" name="bean.spamString"
list="spamStatusOptions" listKey="key" listValue="value" />
</div>
</div>
<br />
