[CMF-checkins] CVS: CMF/CMFDefault/skins/zpt_generic - join_control.py:1.3 join_form.pt:1.9 members_manage_control.py:1.3 members_manage_form.pt:1.2

Wed Nov 26 05:08:53 EST 2003

Update of /cvs-repository/CMF/CMFDefault/skins/zpt_generic
In directory cvs.zope.org:/tmp/cvs-serv20280/CMFDefault/skins/zpt_generic

Modified Files:
	join_control.py join_form.pt members_manage_control.py 
	members_manage_form.pt 
Log Message:
don't render the form if we redirect anyway


=== CMF/CMFDefault/skins/zpt_generic/join_control.py 1.2 => 1.3 ===

--- CMF/CMFDefault/skins/zpt_generic/join_control.py:1.2	Mon Nov  3 05:23:25 2003
+++ CMF/CMFDefault/skins/zpt_generic/join_control.py	Wed Nov 26 05:08:51 2003
@@ -54,6 +54,7 @@
     else:
         target = portal_url
     context.REQUEST.RESPONSE.redirect(target)
+    return None
 
 if message:
     context.REQUEST.set('portal_status_message', message)


=== CMF/CMFDefault/skins/zpt_generic/join_form.pt 1.8 => 1.9 ===
--- CMF/CMFDefault/skins/zpt_generic/join_form.pt:1.8	Mon Nov  3 05:23:25 2003
+++ CMF/CMFDefault/skins/zpt_generic/join_form.pt	Wed Nov 26 05:08:51 2003
@@ -3,6 +3,7 @@
    xmlns:metal="http://xml.zope.org/namespaces/metal"
    xmlns:i18n="http://xml.zope.org/namespaces/i18n"
    tal:define="control python: here.join_control(**request.form)"
+   tal:condition="control"
 ><html metal:use-macro="here/main_template/macros/master">
 <body>
 


=== CMF/CMFDefault/skins/zpt_generic/members_manage_control.py 1.2 => 1.3 ===
--- CMF/CMFDefault/skins/zpt_generic/members_manage_control.py:1.2	Mon Nov  3 06:32:13 2003
+++ CMF/CMFDefault/skins/zpt_generic/members_manage_control.py	Wed Nov 26 05:08:51 2003
@@ -25,6 +25,7 @@
 elif members_new:
     target = '%s/join_form' % portal_url
     context.REQUEST.RESPONSE.redirect(target)
+    return None
 
 if message:
     context.REQUEST.set('portal_status_message', message)


=== CMF/CMFDefault/skins/zpt_generic/members_manage_form.pt 1.1 => 1.2 ===
--- CMF/CMFDefault/skins/zpt_generic/members_manage_form.pt:1.1	Mon Nov  3 05:23:25 2003
+++ CMF/CMFDefault/skins/zpt_generic/members_manage_form.pt	Wed Nov 26 05:08:51 2003
@@ -3,6 +3,7 @@
    xmlns:metal="http://xml.zope.org/namespaces/metal"
    xmlns:i18n="http://xml.zope.org/namespaces/i18n"
    tal:define="control python: here.members_manage_control(**request.form)"
+   tal:condition="control"
 ><html metal:use-macro="here/main_template/macros/master">
 <body>
 


