Author: snoopdave
Date: Tue Aug 7 18:16:48 2007
New Revision: 563715
URL: http://svn.apache.org/viewvc?view=rev&rev=563715
Log:
Partial fix for http://opensource.atlassian.com/projects/roller/browse/ROL-1518
Adds the missing Comments[n] link back to the entry edit page so that you can
manage the comments associated for each entry.
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntry.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/EntryBean.java
roller/trunk/apps/weblogger/web/WEB-INF/classes/ApplicationResources.properties
roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/Comments.jsp
roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryEdit.jsp
roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntrySidebar.jsp
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntry.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntry.java?view=diff&rev=563715&r1=563714&r2=563715
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntry.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntry.java
Tue Aug 7 18:16:48 2007
@@ -857,12 +857,12 @@
try {
WeblogManager wmgr =
WebloggerFactory.getWeblogger().getWeblogManager();
return wmgr.getComments(
-
getWebsite(),
this,
null, // search String
null, // startDate
- null,WeblogEntryComment.APPROVED, // approved comments
only
+ null,
+ approvedOnly ? WeblogEntryComment.APPROVED : null,
false, // we want chrono order
0, // offset
-1); // no limit
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=563715&r1=563714&r2=563715
==============================================================================
---
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
Tue Aug 7 18:16:48 2007
@@ -330,8 +330,13 @@
addMessage("commentManagement.updateSuccess");
// reset form and load fresh comments list
- setBean(new CommentsBean());
-
+ CommentsBean freshBean = new CommentsBean();
+ // but if we're editing an entry's comments stick with that entry
+ if (bean.getEntryId() != null) {
+ freshBean.setEntryId(bean.getEntryId());
+ }
+ setBean(freshBean);
+
return execute();
} catch (Exception ex) {
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java?view=diff&rev=563715&r1=563714&r2=563715
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java
Tue Aug 7 18:16:48 2007
@@ -52,6 +52,7 @@
private String summary = null;
private String text = null;
private String status = null;
+ private String weblogHandle = null;
private String[] plugins = null;
private String dateString = null;
@@ -63,6 +64,7 @@
private boolean rightToLeft = false;
private boolean pinnedToMain = false;
private String enclosureURL = null;
+ private int commentCount = 0;
public String getId() {
@@ -186,6 +188,14 @@
this.commentDays = commentDays;
}
+ public int getCommentCount() {
+ return commentCount;
+ }
+
+ public void setCommentCount(int commentCount) {
+ this.commentCount = commentCount;
+ }
+
public boolean getRightToLeft() {
return this.rightToLeft;
}
@@ -317,6 +327,9 @@
setCategoryId(entry.getCategory().getId());
setTagsAsString(entry.getTagsAsString());
+ // set comment count, ignoreSpam=false, approvedOnly=false
+ setCommentCount(entry.getComments(false, false).size());
+
// init plugins values
if(entry.getPlugins() != null) {
setPlugins(StringUtils.split(entry.getPlugins(), ","));
@@ -383,5 +396,4 @@
return buf.toString();
}
-
}
Modified:
roller/trunk/apps/weblogger/web/WEB-INF/classes/ApplicationResources.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/classes/ApplicationResources.properties?view=diff&rev=563715&r1=563714&r2=563715
==============================================================================
---
roller/trunk/apps/weblogger/web/WEB-INF/classes/ApplicationResources.properties
(original)
+++
roller/trunk/apps/weblogger/web/WEB-INF/classes/ApplicationResources.properties
Tue Aug 7 18:16:48 2007
@@ -1752,7 +1752,7 @@
weblogEdit.trackbackErrorParsing=Trackback failed, url indicated success but
response message was improperly formatted. Response was: {0}
weblogEdit.trackbackError404=Trackback failed, could not reach trackback url.
Are you sure you put in the right url?
-weblogEdit.hasComments=Comments [{0}]
+weblogEdit.hasComments=<a href="{0}">Comments [{1}]</a>
weblogEdit.enclosureURL=Enclosure URL
weblogEdit.enclosureType=Type
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=563715&r1=563714&r2=563715
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/Comments.jsp (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/Comments.jsp Tue Aug 7
18:16:48 2007
@@ -74,9 +74,16 @@
</script>
<p class="subtitle">
- <s:text name="commentManagement.website.subtitle">
- <s:param value="%{actionWeblog.handle}"/>
- </s:text>
+ <s:if test="bean.entryId != null">
+ <s:text name="Manage comments for entry titled <span>{0}</span>">
+ <s:param><s:property value="firstComment.weblogEntry.title"
/></s:param>
+ </s:text>
+ </s:if>
+ <s:else>
+ <s:text name="commentManagement.website.subtitle">
+ <s:param value="%{actionWeblog.handle}"/>
+ </s:text>
+ </s:else>
</p>
<p class="pagetip"><s:text name="commentManagement.tip" /></p>
@@ -94,6 +101,7 @@
<s:form action="comments!update">
<s:hidden name="weblog" />
<s:hidden name="bean.ids" />
+ <s:hidden name="bean.entryId" />
<s:hidden name="bean.offset" />
<s:hidden name="bean.count" />
<s:hidden name="bean.startDateString" />
Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryEdit.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryEdit.jsp?view=diff&rev=563715&r1=563714&r2=563715
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryEdit.jsp (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryEdit.jsp Tue Aug
7 18:16:48 2007
@@ -34,6 +34,7 @@
<s:form id="entry" action="entryEdit!save" onsubmit="editorCleanup()">
<s:hidden name="weblog" />
<s:hidden name="bean.id" />
+ <s:hidden name="bean.commentCount" />
<%-- ==================================================================
--%>
<%-- Title, category, dates and other metadata --%>
Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntrySidebar.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntrySidebar.jsp?view=diff&rev=563715&r1=563714&r2=563715
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntrySidebar.jsp
(original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntrySidebar.jsp Tue
Aug 7 18:16:48 2007
@@ -24,7 +24,20 @@
<div class="sidebarInner">
<h3><s:text name="weblogEdit.comments" /></h3>
- <span><s:text name="application.none" /></span>
+
+ <s:if test="bean.commentCount > 0">
+ <s:url action="comments" id="commentsURL">
+ <s:param name="bean.entryId" value="bean.id" />
+ <s:param name="weblog" value="weblog" />
+ </s:url>
+ <s:text name="weblogEdit.hasComments">
+ <s:param value="%{commentsURL}" />
+ <s:param value="bean.commentCount" />
+ </s:text>
+ </s:if>
+ <s:else>
+ <span><s:text name="application.none" /></span>
+ </s:else>
<hr size="1" noshade="noshade" />
<h3><s:text name="weblogEdit.pendingEntries" /></h3>
