[Checkins] SVN: grok/trunk/ Fixed bug #125720: weird default action
when submitting server form.
Uli Fouquet
uli at gnufix.de
Sat Feb 16 06:28:42 EST 2008
Log message for revision 83884:
Fixed bug #125720: weird default action when submitting server form.
Changed:
U grok/trunk/CHANGES.txt
U grok/trunk/src/grok/admin/view.py
U grok/trunk/src/grok/admin/view_templates/server.pt
-=-
Modified: grok/trunk/CHANGES.txt
===================================================================
--- grok/trunk/CHANGES.txt 2008-02-16 08:39:34 UTC (rev 83883)
+++ grok/trunk/CHANGES.txt 2008-02-16 11:28:41 UTC (rev 83884)
@@ -47,9 +47,12 @@
* Fix https://bugs.launchpad.net/grok/+bug/162437: grok.Form and its
subclasses did not implement IBrowserView.
-* Fix https://bugs.launchpad.net/grok/+bug/185414: grok introsepector
+* Fix https://bugs.launchpad.net/grok/+bug/185414: grok introspector
was broken for zipped eggs.
+* Fix https://bugs.launchpad.net/grok/+bug/125720: server control form
+ had shutdown as default action, even when entering an admin message.
+
Restructuring
-------------
Modified: grok/trunk/src/grok/admin/view.py
===================================================================
--- grok/trunk/src/grok/admin/view.py 2008-02-16 08:39:34 UTC (rev 83883)
+++ grok/trunk/src/grok/admin/view.py 2008-02-16 11:28:41 UTC (rev 83884)
@@ -408,7 +408,7 @@
z3c.flashmessage.interfaces.IMessageSource, name='admin')
if admin_message is not None:
source.send(admin_message)
- elif source.current_message:
+ elif getattr(source, 'current_message', False):
source.delete(source.current_message)
# Restart control
Modified: grok/trunk/src/grok/admin/view_templates/server.pt
===================================================================
--- grok/trunk/src/grok/admin/view_templates/server.pt 2008-02-16 08:39:34 UTC (rev 83883)
+++ grok/trunk/src/grok/admin/view_templates/server.pt 2008-02-16 11:28:41 UTC (rev 83884)
@@ -10,9 +10,13 @@
<input type="submit" name="restart" class="button" value="Restart Zope 3" />
<input type="submit" name="shutdown" class="button" value="Stop Zope 3" />
after <input type="text" name="time" value="0" size="4" /> seconds
+ <input type="hidden" name="submitted" value="true"/>
</p>
</fieldset>
+ </form>
+ <form method="post" action=""
+ tal:attributes="action string:${context/@@absolute_url}/server">
<fieldset>
<legend>Admin message</legend>
More information about the Checkins
mailing list