roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r1053704 - in /roller/trunk: weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp
Date Wed, 29 Dec 2010 19:04:37 GMT
Author: snoopdave
Date: Wed Dec 29 19:04:36 2010
New Revision: 1053704

URL: http://svn.apache.org/viewvc?rev=1053704&view=rev
Log:
Fix for problem with page title, due to substitution problem.
     https://issues.apache.org/jira/browse/ROL-1889

Modified:
    roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java
    roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp

Modified: roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java?rev=1053704&r1=1053703&r2=1053704&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java
(original)
+++ roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java
Wed Dec 29 19:04:36 2010
@@ -97,7 +97,7 @@ public class Comments extends UIAction {
             WeblogEntryManager wmgr = WebloggerFactory.getWeblogger().getWeblogEntryManager();
             
             // lookup weblog entry if necessary
-            if(!StringUtils.isEmpty(getBean().getEntryId())) {
+            if (!StringUtils.isEmpty(getBean().getEntryId())) {
                 setQueryEntry(wmgr.getWeblogEntry(getBean().getEntryId()));
             }
             
@@ -385,6 +385,7 @@ public class Comments extends UIAction {
             
             // reset form and load fresh comments list
             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());

Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp?rev=1053704&r1=1053703&r2=1053704&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp Wed Dec
29 19:04:36 2010
@@ -36,8 +36,8 @@
 
 <p class="subtitle">
     <s:if test="bean.entryId != null && bean.entryId !='' ">
-        <s:text name="Manage comments for entry titled <span>{0}</span>">
-            <s:param><s:property value="firstComment.weblogEntry.title" /></s:param>
+        <s:text name="commentManagement.entry.subtitle">
+            <s:param value="firstComment.weblogEntry.title"/>
         </s:text>
     </s:if>
     <s:else>



Mime
View raw message