[CMF-checkins] CVS: CMF/CMFDefault/skins/control -
addtoFavorites.py:1.5.38.1 change_password.py:1.2.42.1
disableSyndication.py:1.1.70.1 enableSyndication.py:1.1.70.1
folder_copy.py:1.1.70.1 folder_cut.py:1.1.70.1
folder_delete.py:1.2.62.1 folder_paste.py:1.1.70.1
logout.py:1.1.70.1 register.py:1.6.40.1
Sidnei da Silva
sidnei at awkly.org
Thu Apr 22 13:48:31 EDT 2004
Update of /cvs-repository/CMF/CMFDefault/skins/control
In directory cvs.zope.org:/tmp/cvs-serv30596/CMFDefault/skins/control
Modified Files:
Tag: CMF-1_4-branch
addtoFavorites.py change_password.py disableSyndication.py
enableSyndication.py folder_copy.py folder_cut.py
folder_delete.py folder_paste.py logout.py register.py
Log Message:
Fix version.txt to right version. Run reindent.py for removing extra tabs and whitespaces
=== CMF/CMFDefault/skins/control/addtoFavorites.py 1.5 => 1.5.38.1 ===
--- CMF/CMFDefault/skins/control/addtoFavorites.py:1.5 Fri Jun 28 21:25:54 2002
+++ CMF/CMFDefault/skins/control/addtoFavorites.py Thu Apr 22 13:47:52 2004
@@ -5,7 +5,7 @@
homeFolder = portal.portal_membership.getHomeFolder()
if not hasattr(homeFolder, 'Favorites'):
- homeFolder.manage_addPortalFolder(id='Favorites', title='Favorites')
+ homeFolder.manage_addPortalFolder(id='Favorites', title='Favorites')
targetFolder = getattr( homeFolder, 'Favorites' )
new_id='fav_' + str(int( context.ZopeTime()))
myPath=context.portal_url.getRelativeUrl(context)
=== CMF/CMFDefault/skins/control/change_password.py 1.2 => 1.2.42.1 ===
--- CMF/CMFDefault/skins/control/change_password.py:1.2 Mon Mar 18 10:27:20 2002
+++ CMF/CMFDefault/skins/control/change_password.py Thu Apr 22 13:47:52 2004
@@ -5,9 +5,9 @@
failMessage=context.portal_registration.testPasswordValidity(password, confirm)
if failMessage:
- return context.password_form(context,
- context.REQUEST,
- error=failMessage)
+ return context.password_form(context,
+ context.REQUEST,
+ error=failMessage)
member = mt.getAuthenticatedMember()
mt.setPassword(password, domains)
mt.credentialsChanged(password)
=== CMF/CMFDefault/skins/control/disableSyndication.py 1.1 => 1.1.70.1 ===
--- CMF/CMFDefault/skins/control/disableSyndication.py:1.1 Wed Jun 27 12:01:53 2001
+++ CMF/CMFDefault/skins/control/disableSyndication.py Thu Apr 22 13:47:52 2004
@@ -3,7 +3,7 @@
##parameters=
if context.portal_syndication.isSyndicationAllowed(context):
- context.portal_syndication.disableSyndication(context)
- return context.REQUEST.RESPONSE.redirect(context.absolute_url() + '/synPropertiesForm?portal_status_message=Syndication+Disabled')
+ context.portal_syndication.disableSyndication(context)
+ return context.REQUEST.RESPONSE.redirect(context.absolute_url() + '/synPropertiesForm?portal_status_message=Syndication+Disabled')
else:
- return context.REQUEST.RESPONSE.redirect(context.absolute_url() + '/synPropertiesForm?portal_status_message=Syndication+Not+Allowed')
+ return context.REQUEST.RESPONSE.redirect(context.absolute_url() + '/synPropertiesForm?portal_status_message=Syndication+Not+Allowed')
=== CMF/CMFDefault/skins/control/enableSyndication.py 1.1 => 1.1.70.1 ===
--- CMF/CMFDefault/skins/control/enableSyndication.py:1.1 Wed Jun 27 12:13:20 2001
+++ CMF/CMFDefault/skins/control/enableSyndication.py Thu Apr 22 13:47:52 2004
@@ -3,8 +3,7 @@
##parameters=
if context.portal_syndication.isSiteSyndicationAllowed():
- context.portal_syndication.enableSyndication(context)
- return context.REQUEST.RESPONSE.redirect(context.absolute_url() + '/synPropertiesForm?portal_status_message=Syndication+Enabled')
+ context.portal_syndication.enableSyndication(context)
+ return context.REQUEST.RESPONSE.redirect(context.absolute_url() + '/synPropertiesForm?portal_status_message=Syndication+Enabled')
else:
- return context.REQUEST.RESPONSE.redirect(context.absolute_url() + '/synPropertiesForm?portal_status_message=Syndication+Not+Allowed')
-
+ return context.REQUEST.RESPONSE.redirect(context.absolute_url() + '/synPropertiesForm?portal_status_message=Syndication+Not+Allowed')
=== CMF/CMFDefault/skins/control/folder_copy.py 1.1 => 1.1.70.1 ===
--- CMF/CMFDefault/skins/control/folder_copy.py:1.1 Thu Jun 28 15:58:11 2001
+++ CMF/CMFDefault/skins/control/folder_copy.py Thu Apr 22 13:47:52 2004
@@ -3,8 +3,7 @@
##parameters=
REQUEST=context.REQUEST
if REQUEST.has_key('ids'):
- context.manage_copyObjects(REQUEST['ids'], REQUEST, REQUEST.RESPONSE)
- return REQUEST.RESPONSE.redirect(context.absolute_url() + '/folder_contents?portal_status_message=Item(s)+Copied.')
+ context.manage_copyObjects(REQUEST['ids'], REQUEST, REQUEST.RESPONSE)
+ return REQUEST.RESPONSE.redirect(context.absolute_url() + '/folder_contents?portal_status_message=Item(s)+Copied.')
else:
- return REQUEST.RESPONSE.redirect(context.absolute_url() + '/folder_contents?portal_status_message=Please+select+one+or+more+items+to+copy+first.')
-
+ return REQUEST.RESPONSE.redirect(context.absolute_url() + '/folder_contents?portal_status_message=Please+select+one+or+more+items+to+copy+first.')
=== CMF/CMFDefault/skins/control/folder_cut.py 1.1 => 1.1.70.1 ===
--- CMF/CMFDefault/skins/control/folder_cut.py:1.1 Thu Jun 28 15:58:11 2001
+++ CMF/CMFDefault/skins/control/folder_cut.py Thu Apr 22 13:47:52 2004
@@ -3,7 +3,7 @@
##parameters=
REQUEST=context.REQUEST
if REQUEST.has_key('ids'):
- context.manage_cutObjects(REQUEST['ids'], REQUEST)
- return REQUEST.RESPONSE.redirect(context.absolute_url() + '/folder_contents?portal_status_message=Item(s)+Cut.')
+ context.manage_cutObjects(REQUEST['ids'], REQUEST)
+ return REQUEST.RESPONSE.redirect(context.absolute_url() + '/folder_contents?portal_status_message=Item(s)+Cut.')
else:
- return REQUEST.RESPONSE.redirect(context.absolute_url() + '/folder_contents?portal_status_message=Please+select+one+or+more+items+to+cut+first.')
+ return REQUEST.RESPONSE.redirect(context.absolute_url() + '/folder_contents?portal_status_message=Please+select+one+or+more+items+to+cut+first.')
=== CMF/CMFDefault/skins/control/folder_delete.py 1.2 => 1.2.62.1 ===
--- CMF/CMFDefault/skins/control/folder_delete.py:1.2 Tue Dec 11 11:23:32 2001
+++ CMF/CMFDefault/skins/control/folder_delete.py Thu Apr 22 13:47:52 2004
@@ -5,11 +5,11 @@
ret_url = context.absolute_url() + '/folder_contents'
if REQUEST.has_key( 'ids' ):
- context.manage_delObjects( REQUEST['ids'] )
- qs = '?portal_status_message=Deleted.'
-
+ context.manage_delObjects( REQUEST['ids'] )
+ qs = '?portal_status_message=Deleted.'
+
else:
- qs = '?portal_status_message=Please+select+one+or+more+items+first.'
+ qs = '?portal_status_message=Please+select+one+or+more+items+first.'
return REQUEST.RESPONSE.redirect( ret_url + qs )
=== CMF/CMFDefault/skins/control/folder_paste.py 1.1 => 1.1.70.1 ===
--- CMF/CMFDefault/skins/control/folder_paste.py:1.1 Thu Jun 28 15:58:11 2001
+++ CMF/CMFDefault/skins/control/folder_paste.py Thu Apr 22 13:47:52 2004
@@ -3,7 +3,7 @@
##parameters=
REQUEST=context.REQUEST
if context.cb_dataValid:
- context.manage_pasteObjects(REQUEST['__cp'])
- return REQUEST.RESPONSE.redirect(context.absolute_url() + '/folder_contents?portal_status_message=Item(s)+Pasted.')
+ context.manage_pasteObjects(REQUEST['__cp'])
+ return REQUEST.RESPONSE.redirect(context.absolute_url() + '/folder_contents?portal_status_message=Item(s)+Pasted.')
else:
- return REQUEST.RESPONSE.redirect(context.absolute_url() + '/folder_contents?portal_status_message=Copy+or+cut+one+or+more+items+to+paste+first.')
+ return REQUEST.RESPONSE.redirect(context.absolute_url() + '/folder_contents?portal_status_message=Copy+or+cut+one+or+more+items+to+paste+first.')
=== CMF/CMFDefault/skins/control/logout.py 1.1 => 1.1.70.1 ===
--- CMF/CMFDefault/skins/control/logout.py:1.1 Thu Jun 28 11:19:58 2001
+++ CMF/CMFDefault/skins/control/logout.py Thu Apr 22 13:47:52 2004
@@ -3,6 +3,6 @@
##parameters=
REQUEST = context.REQUEST
if REQUEST.has_key('portal_skin'):
- context.portal_skins.clearSkinCookie()
+ context.portal_skins.clearSkinCookie()
REQUEST.RESPONSE.expireCookie('__ac', path='/')
return REQUEST.RESPONSE.redirect(REQUEST.URL1+'/logged_out')
=== CMF/CMFDefault/skins/control/register.py 1.6 => 1.6.40.1 ===
--- CMF/CMFDefault/skins/control/register.py:1.6 Tue Jun 11 09:17:21 2002
+++ CMF/CMFDefault/skins/control/register.py Thu Apr 22 13:47:52 2004
@@ -6,11 +6,11 @@
portal_registration = context.portal_registration
if not portal_properties.validate_email:
- failMessage = portal_registration.testPasswordValidity(password, confirm)
- if failMessage:
- REQUEST.set( 'error', failMessage )
- return context.join_form( context, REQUEST, error=failMessage )
-
+ failMessage = portal_registration.testPasswordValidity(password, confirm)
+ if failMessage:
+ REQUEST.set( 'error', failMessage )
+ return context.join_form( context, REQUEST, error=failMessage )
+
failMessage = portal_registration.testPropertiesValidity(REQUEST)
if failMessage:
More information about the CMF-checkins
mailing list