roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r395472 - in /incubator/roller/trunk: src/org/roller/presentation/servlets/ web/WEB-INF/classes/ web/website/
Date Thu, 20 Apr 2006 03:40:55 GMT
Author: snoopdave
Date: Wed Apr 19 20:40:54 2006
New Revision: 395472

URL: http://svn.apache.org/viewcvs?rev=395472&view=rev
Log:
ROL-1115: comment moderation can now be required (runtime config)

Modified:
    incubator/roller/trunk/src/org/roller/presentation/servlets/CommentServlet.java
    incubator/roller/trunk/src/org/roller/presentation/servlets/TrackbackServlet.java
    incubator/roller/trunk/web/WEB-INF/classes/roller.properties
    incubator/roller/trunk/web/WEB-INF/classes/rollerRuntimeConfigDefs.xml
    incubator/roller/trunk/web/website/edit-website.jsp

Modified: incubator/roller/trunk/src/org/roller/presentation/servlets/CommentServlet.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/servlets/CommentServlet.java?rev=395472&r1=395471&r2=395472&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/servlets/CommentServlet.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/servlets/CommentServlet.java Wed Apr
19 20:40:54 2006
@@ -198,7 +198,7 @@
                     }
                      
                     // If comment moderation is on, set comment as pending
-                    if (website.getModerateComments().booleanValue()) {
+                    if (website.getCommentModerationRequired()) {
                         comment.setPending(Boolean.TRUE);   
                         comment.setApproved(Boolean.FALSE);
                         message = bundle.getString("commentServlet.submittedToModerator");

Modified: incubator/roller/trunk/src/org/roller/presentation/servlets/TrackbackServlet.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/servlets/TrackbackServlet.java?rev=395472&r1=395471&r2=395472&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/servlets/TrackbackServlet.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/servlets/TrackbackServlet.java Wed
Apr 19 20:40:54 2006
@@ -177,7 +177,7 @@
                     
                     if (error == null) {
                         // If comment moderation is on, set comment as pending
-                        if (verified && website.getModerateComments().booleanValue())
{
+                        if (verified && website.getCommentModerationRequired()) {
                             comment.setPending(Boolean.TRUE);   
                             comment.setApproved(Boolean.FALSE);
                         } else if (verified) { 

Modified: incubator/roller/trunk/web/WEB-INF/classes/roller.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/roller.properties?rev=395472&r1=395471&r2=395472&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/roller.properties (original)
+++ incubator/roller/trunk/web/WEB-INF/classes/roller.properties Wed Apr 19 20:40:54 2006
@@ -301,7 +301,7 @@
 planet.aggregator.technorati.limit=500
 
 #----------------------------------
-# user creation setttings: blogroll and cats for new users
+# defaults for new weblogs
 
 # list of links to include in root bookmark folder of each new blog
 # format is like so: linktitle2|linkurl2,linktitle2|linkurl2,linktitle3|linkurl3
@@ -316,6 +316,10 @@
 # comma-separated list of top-level categories to be created in each new weblog
 newuser.categories=\
 General,Status,Java,Music,Politics
+
+# Default weblog editor
+# The list of available editors is in rollerRuntimeConfigDefs.xml
+newweblog.editor=editor-text.jsp
 
 #----------------------------------
 # misc settings

Modified: incubator/roller/trunk/web/WEB-INF/classes/rollerRuntimeConfigDefs.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/rollerRuntimeConfigDefs.xml?rev=395472&r1=395471&r2=395472&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/rollerRuntimeConfigDefs.xml (original)
+++ incubator/roller/trunk/web/WEB-INF/classes/rollerRuntimeConfigDefs.xml Wed Apr 19 20:40:54
2006
@@ -105,6 +105,10 @@
          <!-- defaults to false because we don't distribute mail jars -->
          <default-value>false</default-value> 
       </property-def>
+      <property-def  name="users.moderation.required"  key="configForm.moderationRequired">
+         <type>boolean</type>
+         <default-value>false</default-value>
+      </property-def>
       <property-def name="site.trackbackVerification.enabled" key="configForm.enableTrackbackValidation">
          <type>boolean</type>
          <default-value>false</default-value>

Modified: incubator/roller/trunk/web/website/edit-website.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/website/edit-website.jsp?rev=395472&r1=395471&r2=395472&view=diff
==============================================================================
--- incubator/roller/trunk/web/website/edit-website.jsp (original)
+++ incubator/roller/trunk/web/website/edit-website.jsp Wed Apr 19 20:40:54 2006
@@ -96,15 +96,15 @@
         <td class="description"><%-- <fmt:message key="websiteSettings.tip."
/> --%></td>
     </tr>
     
+    <c:if test="${!model.moderationRequired}">
     <tr>
         <td class="label"><fmt:message key="websiteSettings.moderateComments" /></td>
         <td class="field"><html:checkbox property="moderateComments" /></input></td>
         <td class="description"><%-- <fmt:message key="websiteSettings.tip."
/> --%></td>
     </tr>
+    </c:if>
     
-    <%
-    boolean emailComments = RollerRuntimeConfig.getBooleanProperty("users.comments.emailnotify");
-    if (emailComments) { %>
+    <c:if test="${!model.moderationRequired}">
         <tr>
             <td class="label"><fmt:message key="websiteSettings.emailComments" /></td>
             <td class="field"><html:checkbox property="emailComments" onclick="toggleNextRow(this)"
/></input></td>
@@ -116,7 +116,7 @@
             <td class="field"><html:text size="50" property="emailFromAddress" /></input></td>
             <td class="description"><%-- <fmt:message key="websiteSettings.tip."
/> --%></td>
         </tr>
-    <% } %>
+    </c:if>
 
     <%-- ***** Default entry comment settings ***** --%>
 



Mime
View raw message