[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/ - setRedirect now checks Action conditions

Yvo Schubbe y.2011 at wcm-solutions.de
Fri Jul 29 02:58:03 EDT 2011


Log message for revision 122408:
  - setRedirect now checks Action conditions

Changed:
  U   Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt
  U   Products.CMFDefault/trunk/Products/CMFDefault/formlib/form.py
  U   Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_control/setRedirect.py

-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt	2011-07-29 06:47:08 UTC (rev 122407)
+++ Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt	2011-07-29 06:58:02 UTC (rev 122408)
@@ -4,6 +4,8 @@
 2.3.0-alpha (unreleased)
 ------------------------
 
+- skins and browser views: setRedirect now checks Action conditions.
+
 - Actions: Added 'global/members_register' Action for redirects.
   It is similar to 'user/join', but adjusted for user managers.
 

Modified: Products.CMFDefault/trunk/Products/CMFDefault/formlib/form.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/formlib/form.py	2011-07-29 06:47:08 UTC (rev 122407)
+++ Products.CMFDefault/trunk/Products/CMFDefault/formlib/form.py	2011-07-29 06:58:02 UTC (rev 122408)
@@ -50,7 +50,8 @@
     def _setRedirect(self, provider_id, action_path, keys=''):
         provider = self._getTool(provider_id)
         try:
-            target = provider.getActionInfo(action_path, self.context)['url']
+            target = provider.getActionInfo(action_path, self.context,
+                                            check_condition=1)['url']
         except (ValueError, zExceptions_Unauthorized):
             target = self._getPortalURL()
 

Modified: Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_control/setRedirect.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_control/setRedirect.py	2011-07-29 06:47:08 UTC (rev 122407)
+++ Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_control/setRedirect.py	2011-07-29 06:58:02 UTC (rev 122408)
@@ -10,7 +10,7 @@
 
 
 try:
-    target = provider.getActionInfo(action_path)['url']
+    target = provider.getActionInfo(action_path, check_condition=1)['url']
 except (ValueError, zExceptions_Unauthorized):
     target = portal_url
 



More information about the checkins mailing list