diff --git a/product/CMFActivity/ActivityTool.py b/product/CMFActivity/ActivityTool.py index aaed45c64b4c809d33a5d95c5c34d6824a8964d9..ebc043f440558e102fb5a4931e583ec4b44abe22 100644 --- a/product/CMFActivity/ActivityTool.py +++ b/product/CMFActivity/ActivityTool.py @@ -653,7 +653,7 @@ class ActivityTool (BaseTool): manage_overview = DTMLFile( 'dtml/explainActivityTool', globals() ) security.declareProtected( CMFCorePermissions.ManagePortal , 'manageLoadBalancing' ) - manageLoadBalancing = DTMLFile( 'dtml/manageLoadBalancing', globals() ) + manageLoadBalancing = DTMLFile( 'dtml/manageLoadBalancing', globals(), _getCurrentNode=getCurrentNode) distributingNode = '' _nodes = () diff --git a/product/CMFActivity/dtml/manageLoadBalancing.dtml b/product/CMFActivity/dtml/manageLoadBalancing.dtml index b6566147a585356ba73a60c41f0507242252aa5b..75e49e6cc52984997db17ed709c13c5da98b89ef 100644 --- a/product/CMFActivity/dtml/manageLoadBalancing.dtml +++ b/product/CMFActivity/dtml/manageLoadBalancing.dtml @@ -82,8 +82,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. </td> </tr> <tr> - <td>Current node is <b><dtml-var getCurrentNode></b></td> - <dtml-if expr="getCurrentNode() not in getNodeList()"> + <td>Current node is <b><dtml-var _getCurrentNode></b></td> + <dtml-if expr="_getCurrentNode() not in getNodeList()"> <td align="left" valign="top" colspan=2> <p style="color: #F00"><b>Warning: Current node is not known to distribution system.</b></p> <p> diff --git a/product/CMFActivity/tests/testCMFActivity.py b/product/CMFActivity/tests/testCMFActivity.py index 6a919c8f6df4980f1c6fbdead4b628c2941de283..41d17b55c51255f3a73cf632fc79db9e02c8d5d3 100644 --- a/product/CMFActivity/tests/testCMFActivity.py +++ b/product/CMFActivity/tests/testCMFActivity.py @@ -27,7 +27,7 @@ ############################################################################## import inspect -import unittest +import warnings from functools import wraps from itertools import product from Products.ERP5Type.tests.utils import LogInterceptor @@ -2656,8 +2656,11 @@ return [x.getObject() for x in context.portal_catalog(limit=100)] [message], ) -def test_suite(): - suite = unittest.TestSuite() - suite.addTest(unittest.makeSuite(TestCMFActivity)) - return suite - + def test_zmi_views(self): + # we can render ZMI view without errors or warnings + with warnings.catch_warnings(record=True) as catched_warnings: + self.portal.portal_activities.manage_overview() + self.portal.portal_activities.manageActivities() + self.portal.portal_activities.manageActivitiesAdvanced() + self.portal.portal_activities.manageLoadBalancing() + self.assertEqual(catched_warnings, [])