[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/ - tweaking
Yvo Schubbe
cvs-admin at zope.org
Mon Jul 30 06:33:48 UTC 2012
Log message for revision 127399:
- tweaking
Changed:
U Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder.py
U Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/folder.txt
U Products.CMFDefault/trunk/Products/CMFDefault/formlib/form.py
-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder.py 2012-07-30 06:29:06 UTC (rev 127398)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder.py 2012-07-30 06:33:45 UTC (rev 127399)
@@ -15,6 +15,8 @@
import urllib
+from Acquisition import aq_inner
+from Acquisition import aq_parent
from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
from zope.component import getUtility
from zope.formlib import form
@@ -74,7 +76,7 @@
object_actions = form.Actions(
form.Action(
name='rename',
- label=_(u'Rename'),
+ label=_(u'Rename...'),
validator='validate_items',
condition='show_rename',
success='handle_rename',
@@ -97,7 +99,8 @@
name='paste',
label=_(u'Paste'),
condition='show_paste',
- success='handle_paste'),
+ success='handle_paste',
+ failure='handle_failure'),
form.Action(
name='delete',
label=_(u'Delete'),
@@ -182,7 +185,7 @@
@decode
def up_info(self):
"""Link to the contens view of the parent object"""
- up_obj = self.context.aq_inner.aq_parent
+ up_obj = aq_parent(aq_inner(self.context))
mtool = getUtility(IMembershipTool)
allowed = mtool.checkPermission(ListFolderContents, up_obj)
if allowed:
@@ -366,10 +369,9 @@
else:
self.status = _(u'Items pasted.')
except CopyError:
- self.status = _(u'CopyError: Paste failed.')
self.request['RESPONSE'].expireCookie('__cp',
path='%s' % (self.request['BASEPATH1'] or "/"))
- return self.handle_failure(action, data, ())
+ self.status = _(u'CopyError: Paste failed.')
except ValueError:
self.status = _(u'ValueError: Paste failed.')
return self.handle_failure(action, data, ())
@@ -402,7 +404,7 @@
elif attempt > 1:
self.status = _(u'Items moved up.')
else:
- self.status = _(u'Nothing to change.')
+ self.status = self.noChangesMessage
except ValueError:
self.status = _(u'ValueError: Move failed.')
return self.handle_failure(action, data, ())
@@ -422,7 +424,7 @@
elif attempt > 1:
self.status = _(u'Items moved down.')
else:
- self.status = _(u'Nothing to change.')
+ self.status = self.noChangesMessage
except ValueError:
self.status = _(u'ValueError: Move failed.')
return self.handle_failure(action, data, ())
@@ -441,7 +443,7 @@
elif attempt > 1:
self.status = _(u'Items moved to top.')
else:
- self.status = _(u'Nothing to change.')
+ self.status = self.noChangesMessage
except ValueError:
self.status = _(u'ValueError: Move failed.')
return self.handle_failure(action, data, ())
@@ -460,7 +462,7 @@
elif attempt > 1:
self.status = _(u'Items moved to bottom.')
else:
- self.status = _(u'Nothing to change.')
+ self.status = self.noChangesMessage
except ValueError:
self.status = _(u'ValueError: Move failed.')
return self.handle_failure(action, data, ())
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/folder.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/folder.txt 2012-07-30 06:29:06 UTC (rev 127398)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/folder.txt 2012-07-30 06:33:45 UTC (rev 127399)
@@ -64,7 +64,7 @@
Verify initially visible buttons:
>>> browser.open('http://localhost/site/@@edit.html')
- >>> '[[cmf_default][Rename]]' in browser.contents
+ >>> '[[cmf_default][Rename...]]' in browser.contents
True
>>> '[[cmf_default][Cut]]' in browser.contents
True
@@ -95,7 +95,7 @@
Now there is clipboard data and the paste button is also visible:
>>> browser.open('http://localhost/site/@@edit.html')
- >>> '[[cmf_default][Rename]]' in browser.contents
+ >>> '[[cmf_default][Rename...]]' in browser.contents
True
>>> '[[cmf_default][Cut]]' in browser.contents
True
@@ -125,7 +125,7 @@
Now there is more than one object and the order buttons are visible:
>>> browser.open('http://localhost/site/@@edit.html')
- >>> '[[cmf_default][Rename]]' in browser.contents
+ >>> '[[cmf_default][Rename...]]' in browser.contents
True
>>> '[[cmf_default][Cut]]' in browser.contents
True
@@ -151,7 +151,7 @@
>>> from Products.CMFDefault.permissions import AddPortalContent
>>> app.site.manage_permission(AddPortalContent, roles=[])
>>> browser.open('http://localhost/site/@@edit.html')
- >>> '[[cmf_default][Rename]]' in browser.contents
+ >>> '[[cmf_default][Rename...]]' in browser.contents
False
>>> '[[cmf_default][Cut]]' in browser.contents
True
@@ -166,7 +166,7 @@
>>> from Products.CMFDefault.permissions import DeleteObjects
>>> app.site.manage_permission(DeleteObjects, roles=[])
>>> browser.open('http://localhost/site/@@edit.html')
- >>> '[[cmf_default][Rename]]' in browser.contents
+ >>> '[[cmf_default][Rename...]]' in browser.contents
True
>>> '[[cmf_default][Cut]]' in browser.contents
True
@@ -181,7 +181,7 @@
>>> from Products.CMFDefault.permissions import ViewManagementScreens
>>> app.site.manage_permission(ViewManagementScreens, roles=[])
>>> browser.open('http://localhost/site/@@edit.html')
- >>> '[[cmf_default][Rename]]' in browser.contents
+ >>> '[[cmf_default][Rename...]]' in browser.contents
False
>>> '[[cmf_default][Cut]]' in browser.contents
False
@@ -196,7 +196,7 @@
Sorted by getId different buttons are visible:
>>> browser.open('http://localhost/site/@@edit.html?form.sort_key=getId')
- >>> '[[cmf_default][Rename]]' in browser.contents
+ >>> '[[cmf_default][Rename...]]' in browser.contents
True
>>> '[[cmf_default][Cut]]' in browser.contents
True
Modified: Products.CMFDefault/trunk/Products/CMFDefault/formlib/form.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/formlib/form.py 2012-07-30 06:29:06 UTC (rev 127398)
+++ Products.CMFDefault/trunk/Products/CMFDefault/formlib/form.py 2012-07-30 06:33:45 UTC (rev 127399)
@@ -48,6 +48,7 @@
class _EditFormMixin(ViewBase):
template = ViewPageTemplateFile('editform.pt')
+ noChangesMessage = _(u'Nothing to change.')
def _setRedirect(self, provider_id, action_path, keys=''):
provider = getToolByName(self.context, provider_id)
@@ -117,7 +118,6 @@
description = u''
successMessage = _(u"Settings changed.")
- noChangesMessage = _(u'Nothing to change.')
def getContent(self):
return self.context
More information about the checkins
mailing list