X-Git-Url: https://svn.cri.ensmp.fr/git/Plinn.git/blobdiff_plain/de068d5b8a1fd46a70f75f4e20e581ee846f866d..a75be5ed39db7d2d87f5184ea30ce17ec8b4c5ab:/skins/photo_theme/homepage_dispatcher.py diff --git a/skins/photo_theme/homepage_dispatcher.py b/skins/photo_theme/homepage_dispatcher.py index 57262be..bc3e140 100755 --- a/skins/photo_theme/homepage_dispatcher.py +++ b/skins/photo_theme/homepage_dispatcher.py @@ -3,26 +3,27 @@ from Products.CMFCore.utils import getToolByName from ZTUtils import make_query as mq from Products.CMFDefault.utils import Message as _ +utool = getToolByName(context, 'portal_url') req = context.REQUEST resp = req.RESPONSE came_from = req.form.get('came_from') if came_from : - urlQs = came_from.split('?', 1) - if len(urlQs) == 1 : - came_from = '%s?%s' % (urlQs[0], mq(portal_status_message=_('Login success'))) - else : - url, qs= urlQs - came_from = '%s?%s&%s' % (url, qs, mq(portal_status_message=_('Login success'))) - return resp.redirect(came_from) + urlQs = came_from.split('?', 1) + if len(urlQs) == 1 : + came_from = '%s?%s' % (urlQs[0], mq(portal_status_message=_('Login success'))) + else : + url, qs= urlQs + came_from = '%s?%s&%s' % (url, qs, mq(portal_status_message=_('Login success'))) + return resp.redirect(came_from) else : - from Products.realis.utils import searchContentsWithLocalRolesForAuthenticatedUser as search - results = search(context, portal_type='Portfolio') - if results : - atool = getToolByName(context, 'portal_actions') - return context.setRedirect(atool, 'user/my_albums', portal_status_message=_('Login success')) - else : - utool = getToolByName(context, 'portal_url') - return resp.redirect('%s?%s' % (utool(), mq(portal_status_message=_('Login success')))) - \ No newline at end of file + from Products.Plinn.utils import searchContentsWithLocalRolesForAuthenticatedUser as search + results = search(portal_type='Portfolio') + if results : + atool = getToolByName(context, 'portal_actions') + return context.setRedirect(atool, 'user/my_albums', portal_status_message=_('Login success')) + else : + utool = getToolByName(context, 'portal_url') + return resp.redirect('%s?%s' % (utool(), mq(portal_status_message=_('Login success')))) + \ No newline at end of file