Author: jalkanen
Date: Sun Aug 31 11:55:47 2008
New Revision: 690760
URL: http://svn.apache.org/viewvc?rev=690760&view=rev
Log:
JSPWIKI-366: changenotes were lost on comment previews.
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
incubator/jspwiki/trunk/src/webdocs/Comment.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/editors/FCK.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/editors/preview.jsp
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=690760&r1=690759&r2=690760&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sun Aug 31 11:55:47 2008
@@ -1,3 +1,10 @@
+2008-08-31 Janne Jalkanen <[EMAIL PROTECTED]>
+
+ * 2.7.0-alpha-36
+
+ * [JSPWIKI-366]: changenote was lost in commenting previews. Also, FCK
+ was not showing the changenote field.
+
2008-08-31 Harry Metske <[EMAIL PROTECTED]>
* 2.7.0-alpha-35
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java?rev=690760&r1=690759&r2=690760&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java Sun Aug 31
11:55:47 2008
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "35";
+ public static final String BUILD = "36";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/trunk/src/webdocs/Comment.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Comment.jsp?rev=690760&r1=690759&r2=690760&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Comment.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Comment.jsp Sun Aug 31 11:55:47 2008
@@ -94,6 +94,9 @@
session.setAttribute( "link", link );
+ if( changenote != null )
+ session.setAttribute( "changenote", changenote );
+
//
// Branch
//
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/editors/FCK.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/editors/FCK.jsp?rev=690760&r1=690759&r2=690760&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/editors/FCK.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/editors/FCK.jsp Sun
Aug 31 11:55:47 2008
@@ -119,7 +119,7 @@
<div class="error"><fmt:message key="editor.fck.noscript" /></div>
</noscript>
- <wiki:CheckRequestContext context="edit">
+ <wiki:CheckRequestContext context="edit|comment">
<p>
<label for="changenote"><fmt:message
key='editor.plain.changenote'/></label>
<input type="text" id="changenote" name="changenote" size="80"
maxlength="80" value="<c:out value='${changenote}'/>"/>
Modified:
incubator/jspwiki/trunk/src/webdocs/templates/default/editors/preview.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/editors/preview.jsp?rev=690760&r1=690759&r2=690760&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/editors/preview.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/editors/preview.jsp
Sun Aug 31 11:55:47 2008
@@ -31,6 +31,7 @@
<input type="hidden" name="author" value="<c:out value='${author}' />" />
<input type="hidden" name="link" value="<c:out value='${link}' />" />
<input type="hidden" name="remember" value="<c:out value='${remember}' />"
/>
+ <input type="hidden" name="changenote" value="<c:out value='${changenote}'
/>" />
<input type="hidden" name="page" value="<wiki:Variable var='pagename' />"
/>
<input type="hidden" name="action" value="save" />
