You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2006/04/25 19:18:04 UTC

svn commit: r396924 - in /incubator/roller/trunk: src/org/roller/presentation/website/actions/WebsiteFormAction.java web/WEB-INF/classes/ApplicationResources.properties

Author: snoopdave
Date: Tue Apr 25 10:18:01 2006
New Revision: 396924

URL: http://svn.apache.org/viewcvs?rev=396924&view=rev
Log:
Fixed disable comments for inactive weblog logic and added explanation message for user

Modified:
    incubator/roller/trunk/src/org/roller/presentation/website/actions/WebsiteFormAction.java
    incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources.properties

Modified: incubator/roller/trunk/src/org/roller/presentation/website/actions/WebsiteFormAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/website/actions/WebsiteFormAction.java?rev=396924&r1=396923&r2=396924&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/website/actions/WebsiteFormAction.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/website/actions/WebsiteFormAction.java Tue Apr 25 10:18:01 2006
@@ -151,7 +151,11 @@
                     form.copyTo(wd, request.getLocale());
                     
                     // ROL-485: comments not be allowed on inactive weblogs
-                    wd.setAllowComments(wd.getActive());
+                    if (wd.getActive() != null && !wd.getActive().booleanValue()) {
+                        wd.setAllowComments(Boolean.FALSE);
+                        messages.add(null, new ActionMessage(
+                            "websiteSettings.commentsOffForInactiveWeblog"));
+                    }
                                         
                     umgr.saveWebsite(wd);  
                     

Modified: incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources.properties?rev=396924&r1=396923&r2=396924&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources.properties (original)
+++ incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources.properties Tue Apr 25 10:18:01 2006
@@ -1498,6 +1498,7 @@
 websiteSettings.moderateComments=Moderate comments
 websiteSettings.emailComments=Email Comments?
 websiteSettings.emailFromAddress=Default <em>from</em> e-mail address for notifications
+websiteSettings.commentsOffForInactiveWeblog=Turned comments off for inactive weblog
 
 # --- Default comments settings