[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/ - use fallback target for Unauthorized as well
Yvo Schubbe
y.2011 at wcm-solutions.de
Fri Jul 22 05:20:24 EDT 2011
Log message for revision 122315:
- use fallback target for Unauthorized as well
Changed:
U Products.CMFDefault/trunk/Products/CMFDefault/formlib/form.py
UU Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_control/setRedirect.py
-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/formlib/form.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/formlib/form.py 2011-07-22 08:51:18 UTC (rev 122314)
+++ Products.CMFDefault/trunk/Products/CMFDefault/formlib/form.py 2011-07-22 09:20:24 UTC (rev 122315)
@@ -35,6 +35,7 @@
from Products.CMFCore.interfaces import ITypeInformation
from Products.CMFDefault.browser.utils import ViewBase
from Products.CMFDefault.exceptions import AccessControl_Unauthorized
+from Products.CMFDefault.exceptions import zExceptions_Unauthorized
from Products.CMFDefault.formlib.widgets import IDInputWidget
from Products.CMFDefault.interfaces import ICMFDefaultSkin
from Products.CMFDefault.permissions import AddPortalContent
@@ -50,7 +51,7 @@
provider = self._getTool(provider_id)
try:
target = provider.getActionInfo(action_path, self.context)['url']
- except ValueError:
+ except (ValueError, zExceptions_Unauthorized):
target = self._getPortalURL()
kw = {}
Modified: Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_control/setRedirect.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_control/setRedirect.py 2011-07-22 08:51:18 UTC (rev 122314)
+++ Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_control/setRedirect.py 2011-07-22 09:20:24 UTC (rev 122315)
@@ -2,6 +2,7 @@
##
from ZTUtils import make_query
from Products.CMFCore.utils import getToolByName
+from Products.CMFDefault.exceptions import zExceptions_Unauthorized
from Products.CMFDefault.utils import getBrowserCharset
utool = getToolByName(script, 'portal_url')
@@ -10,7 +11,7 @@
try:
target = provider.getActionInfo(action_path)['url']
-except ValueError:
+except (ValueError, zExceptions_Unauthorized):
target = portal_url
message = context.REQUEST.other.get('portal_status_message', '')
@@ -22,7 +23,7 @@
if not v:
del kw[k]
-query = kw and ( '?%s' % make_query(kw) ) or ''
-context.REQUEST.RESPONSE.redirect( '%s%s' % (target, query) )
+query = kw and ('?%s' % make_query(kw)) or ''
+context.REQUEST.RESPONSE.redirect('%s%s' % (target, query))
return True
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_control/setRedirect.py
___________________________________________________________________
Deleted: svn:keywords
- Author Date Id Revision
More information about the checkins
mailing list