[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/browser/ - allow to override the validate method

Yvo Schubbe cvs-admin at zope.org
Mon Jul 2 07:10:42 UTC 2012


Log message for revision 127215:
  - allow to override the validate method

Changed:
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder.py
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/members.py

-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder.py	2012-07-01 10:56:50 UTC (rev 127214)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder.py	2012-07-02 07:10:38 UTC (rev 127215)
@@ -447,11 +447,12 @@
     def validate_items(self, action=None, data=None):
         """Check whether any items have been selected for
         the requested action."""
-        super(ContentsView, self).validate(action, data)
+        errors = self.validate(action, data)
+        if errors:
+            return errors
         if self._get_ids(data) == []:
-            return [_(u"Please select one or more items first.")]
-        else:
-            return []
+            errors.append(_(u"Please select one or more items first."))
+        return errors
 
     #Action handlers
     def handle_rename(self, action, data):

Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/members.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/members.py	2012-07-01 10:56:50 UTC (rev 127214)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/members.py	2012-07-02 07:10:38 UTC (rev 127215)
@@ -152,11 +152,12 @@
     def validate_items(self, action=None, data=None):
         """Check whether any items have been selected for
         the requested action."""
-        super(Manage, self).validate(action, data)
+        errors = self.validate(action, data)
+        if errors:
+            return errors
         if self._get_ids(data) == []:
-            return [_(u"Please select one or more members first.")]
-        else:
-            return []
+            errors.append(_(u"Please select one or more members first."))
+        return errors
 
     def handle_add(self, action, data):
         """Redirect to the join form where managers can add users"""



More information about the checkins mailing list