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/05/12 20:23:23 UTC
svn commit: r405822 - in /incubator/roller/trunk/src/org/apache/roller/presentation/website: actions/WebsiteFormAction.java formbeans/WebsiteFormEx.java

Author: snoopdave
Date: Fri May 12 11:23:22 2006
New Revision: 405822

URL: http://svn.apache.org/viewcvs?rev=405822&view=rev
Log:
Bug in interpreration of checkbox value

Modified:
    incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/WebsiteFormAction.java
    incubator/roller/trunk/src/org/apache/roller/presentation/website/formbeans/WebsiteFormEx.java

Modified: incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/WebsiteFormAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/WebsiteFormAction.java?rev=405822&r1=405821&r2=405822&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/WebsiteFormAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/WebsiteFormAction.java Fri May 12 11:23:22 2006
@@ -368,7 +368,7 @@
                     Map plugins = ppmgr.createAndInitPagePlugins(
                             getWebsite(),
                             RollerContext.getRollerContext().getServletContext(),
-                            RollerContext.getRollerContext().getAbsoluteContextUrl(),
+                            RollerContext.getRollerContext().getAbsoluteContextUrl(request),
                             new VelocityContext());
                     Iterator it = plugins.values().iterator();
                     while (it.hasNext()) list.add(it.next());

Modified: incubator/roller/trunk/src/org/apache/roller/presentation/website/formbeans/WebsiteFormEx.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/presentation/website/formbeans/WebsiteFormEx.java?rev=405822&r1=405821&r2=405822&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/website/formbeans/WebsiteFormEx.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/presentation/website/formbeans/WebsiteFormEx.java Fri May 12 11:23:22 2006
@@ -38,7 +38,7 @@
     private String bloggerCategoryId;
     private String defaultCategoryId;
     private String[] defaultPluginsArray;
-    private boolean applyCommentDefaults = false;
+    private Boolean applyCommentDefaults = false;
     
     /**
      * @return Returns the bloggerCategoryId.
@@ -82,11 +82,11 @@
         defaultPluginsArray = strings;
     }
     
-    public boolean isApplyCommentDefaults() {
+    public Boolean isApplyCommentDefaults() {
         return applyCommentDefaults;
     }
     
-    public void setApplyCommentDefaults(boolean applyCommentDefaults) {
+    public void setApplyCommentDefaults(Boolean applyCommentDefaults) {
         this.applyCommentDefaults = applyCommentDefaults;
     }
     
@@ -161,6 +161,9 @@
         }
         if (this.getActive() == null) {
             dataHolder.setActive(Boolean.FALSE);
+        }
+        if (this.isApplyCommentDefaults() == null) {
+            dataHolder.setApplyCommentDefaults(false);
         }
         
         WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();