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 2005/11/29 04:32:54 UTC
svn commit: r349604 - in /incubator/roller/trunk:
src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java
web/website/edit-website.jsp
Author: snoopdave
Date: Mon Nov 28 19:32:46 2005
New Revision: 349604
URL: http://svn.apache.org/viewcvs?rev=349604&view=rev
Log:
Using default comment settings
Modified:
incubator/roller/trunk/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java
incubator/roller/trunk/web/website/edit-website.jsp
Modified: incubator/roller/trunk/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java?rev=349604&r1=349603&r2=349604&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java Mon Nov 28 19:32:46 2005
@@ -105,6 +105,8 @@
form.initNew(request, response);
form.setCreatorId(rses.getAuthenticatedUser().getId());
form.setWebsiteId(rreq.getWebsite().getId());
+ form.setAllowComments(rreq.getWebsite().getDefaultAllowComments());
+ form.setCommentDays(new Integer(rreq.getWebsite().getDefaultCommentDays()));
request.setAttribute("model",
new WeblogEntryPageModel(request, response, mapping,
Modified: incubator/roller/trunk/web/website/edit-website.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/website/edit-website.jsp?rev=349604&r1=349603&r2=349604&view=diff
==============================================================================
--- incubator/roller/trunk/web/website/edit-website.jsp (original)
+++ incubator/roller/trunk/web/website/edit-website.jsp Mon Nov 28 19:32:46 2005
@@ -122,7 +122,22 @@
</tr>
<tr>
<td class="label"><fmt:message key="websiteSettings.defaultCommentDays" /></td>
- <td class="field"><html:checkbox property="defaultCommentDays" /></input></td>
+ <td class="field">
+ <html:select property="defaultCommentDays">
+ <html:option key="weblogEdit.unlimitedCommentDays" value="0" />
+ <html:option key="weblogEdit.days1" value="1" />
+ <html:option key="weblogEdit.days2" value="2" />
+ <html:option key="weblogEdit.days3" value="3" />
+ <html:option key="weblogEdit.days4" value="4" />
+ <html:option key="weblogEdit.days5" value="5" />
+ <html:option key="weblogEdit.days7" value="7" />
+ <html:option key="weblogEdit.days10" value="10" />
+ <html:option key="weblogEdit.days20" value="20" />
+ <html:option key="weblogEdit.days30" value="30" />
+ <html:option key="weblogEdit.days60" value="60" />
+ <html:option key="weblogEdit.days90" value="90" />
+ </html:select>
+ </td>
<td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
</tr>