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 2007/08/10 18:27:26 UTC
svn commit: r564654 - in
/roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor: EntryAdd.jsp
EntryEdit.jsp
Author: snoopdave
Date: Fri Aug 10 09:27:25 2007
New Revision: 564654
URL: http://svn.apache.org/viewvc?view=rev&rev=564654
Log:
Fixes "Drafts erroneously published if user hits enter while in title or tags field"
http://opensource.atlassian.com/projects/roller/browse/ROL-1525
There may be a more sophisticated fix that allows us to maintain the old button order, but the easiest fix here is to put the draft button first in the line-up.
I tried to disable the "enter" button entirely via onsubmit="return false" and postToWeblog() saveAsDraft() and submitForReview() methods, but the Struts2 <s:form> element changes that to "return false; return true", so I backed off to this more simple approach.
Modified:
roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryAdd.jsp
roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryEdit.jsp
Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryAdd.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryAdd.jsp?view=diff&rev=564654&r1=564653&r2=564654
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryAdd.jsp (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryAdd.jsp Fri Aug 10 09:27:25 2007
@@ -181,13 +181,13 @@
<br>
<div class="control">
+ <s:submit key="weblogEdit.save" onclick="$('entry_bean_status').value='DRAFT';" />
<s:if test="userAnAuthor">
<s:submit key="weblogEdit.post" onclick="$('entry_bean_status').value='PUBLISHED';"/>
</s:if>
<s:else>
<s:submit key="weblogEdit.submitForReview" onclick="$('entry_bean_status').value='PENDING';"/>
</s:else>
- <s:submit key="weblogEdit.save" onclick="$('entry_bean_status').value='DRAFT';" />
</div>
</s:form>
Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryEdit.jsp?view=diff&rev=564654&r1=564653&r2=564654
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryEdit.jsp (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryEdit.jsp Fri Aug 10 09:27:25 2007
@@ -238,14 +238,14 @@
<br>
<div class="control">
+ <s:submit key="weblogEdit.save" onclick="$('entry_bean_status').value='DRAFT';" />
+
<s:if test="userAnAuthor">
<s:submit key="weblogEdit.post" onclick="$('entry_bean_status').value='PUBLISHED';"/>
</s:if>
<s:else>
<s:submit key="weblogEdit.submitForReview" onclick="$('entry_bean_status').value='PENDING';"/>
- </s:else>
-
- <s:submit key="weblogEdit.save" onclick="$('entry_bean_status').value='DRAFT';" />
+ </s:else>
<s:url id="removeUrl" action="entryRemove">
<s:param name="weblog" value="actionWeblog.handle" />
Re: svn commit: r564654 - in /roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor: EntryAdd.jsp EntryEdit.jsp
Posted by Matt Raible <ma...@raibledesigns.com>.
Here's another option you might try (thought I think your solution is
good enough):
http://raibledesigns.com/rd/entry/howto_set_the_default_submit
Matt
On 8/10/07, snoopdave@apache.org <sn...@apache.org> wrote:
> Author: snoopdave
> Date: Fri Aug 10 09:27:25 2007
> New Revision: 564654
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=564654
> Log:
> Fixes "Drafts erroneously published if user hits enter while in title or tags field"
> http://opensource.atlassian.com/projects/roller/browse/ROL-1525
>
> There may be a more sophisticated fix that allows us to maintain the old button order, but the easiest fix here is to put the draft button first in the line-up.
>
> I tried to disable the "enter" button entirely via onsubmit="return false" and postToWeblog() saveAsDraft() and submitForReview() methods, but the Struts2 <s:form> element changes that to "return false; return true", so I backed off to this more simple approach.
>
> Modified:
> roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryAdd.jsp
> roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryEdit.jsp
>
> Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryAdd.jsp
> URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryAdd.jsp?view=diff&rev=564654&r1=564653&r2=564654
> ==============================================================================
> --- roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryAdd.jsp (original)
> +++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryAdd.jsp Fri Aug 10 09:27:25 2007
> @@ -181,13 +181,13 @@
>
> <br>
> <div class="control">
> + <s:submit key="weblogEdit.save" onclick="$('entry_bean_status').value='DRAFT';" />
> <s:if test="userAnAuthor">
> <s:submit key="weblogEdit.post" onclick="$('entry_bean_status').value='PUBLISHED';"/>
> </s:if>
> <s:else>
> <s:submit key="weblogEdit.submitForReview" onclick="$('entry_bean_status').value='PENDING';"/>
> </s:else>
> - <s:submit key="weblogEdit.save" onclick="$('entry_bean_status').value='DRAFT';" />
> </div>
>
> </s:form>
>
> Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryEdit.jsp
> URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryEdit.jsp?view=diff&rev=564654&r1=564653&r2=564654
> ==============================================================================
> --- roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryEdit.jsp (original)
> +++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryEdit.jsp Fri Aug 10 09:27:25 2007
> @@ -238,14 +238,14 @@
>
> <br>
> <div class="control">
> + <s:submit key="weblogEdit.save" onclick="$('entry_bean_status').value='DRAFT';" />
> +
> <s:if test="userAnAuthor">
> <s:submit key="weblogEdit.post" onclick="$('entry_bean_status').value='PUBLISHED';"/>
> </s:if>
> <s:else>
> <s:submit key="weblogEdit.submitForReview" onclick="$('entry_bean_status').value='PENDING';"/>
> - </s:else>
> -
> - <s:submit key="weblogEdit.save" onclick="$('entry_bean_status').value='DRAFT';" />
> + </s:else>
>
> <s:url id="removeUrl" action="entryRemove">
> <s:param name="weblog" value="actionWeblog.handle" />
>
>
>
--
http://raibledesigns.com