[Erp5-report] r38350 jerome - in /erp5/trunk/products/ERP5Form: ./ tests/
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Sep 14 13:48:23 CEST 2010
Author: jerome
Date: Tue Sep 14 13:48:19 2010
New Revision: 38350
URL: http://svn.erp5.org?rev=38350&view=rev
Log:
- include the username in the cache key, because user can change in one transaction
- adjust tests after 38131
Modified:
erp5/trunk/products/ERP5Form/PreferenceTool.py
erp5/trunk/products/ERP5Form/tests/testPreferences.py
Modified: erp5/trunk/products/ERP5Form/PreferenceTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/PreferenceTool.py?rev=38350&r1=38349&r2=38350&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/PreferenceTool.py [utf8] (original)
+++ erp5/trunk/products/ERP5Form/PreferenceTool.py [utf8] Tue Sep 14 13:48:19 2010
@@ -227,13 +227,14 @@ class PreferenceTool(BaseTool):
sorted so that the first in the list should be applied first
"""
tv = getTransactionalVariable(self)
- tv_key = 'PreferenceTool._getSortedPreferenceList/%s' % sql_catalog_id
+ user = getToolByName(self, 'portal_membership').getAuthenticatedMember()
+ tv_key = 'PreferenceTool._getSortedPreferenceList/%s/%s' % (user,
+ sql_catalog_id)
if tv.get(tv_key, None) is None:
prefs = []
# XXX will also cause problems with Manager (too long)
# XXX For manager, create a manager specific preference
# or better solution
- user = getToolByName(self, 'portal_membership').getAuthenticatedMember()
user_is_manager = 'Manager' in user.getRolesInContext(self)
for pref in self.searchFolder(portal_type='Preference', sql_catalog_id=sql_catalog_id):
pref = pref.getObject()
@@ -254,7 +255,6 @@ class PreferenceTool(BaseTool):
preference_list = sys_prefs + prefs
tv[tv_key] = preference_list
else:
- portal = self.getPortalObject()
preference_list = tv[tv_key]
return preference_list
Modified: erp5/trunk/products/ERP5Form/tests/testPreferences.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/tests/testPreferences.py?rev=38350&r1=38349&r2=38350&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/tests/testPreferences.py [utf8] (original)
+++ erp5/trunk/products/ERP5Form/tests/testPreferences.py [utf8] Tue Sep 14 13:48:19 2010
@@ -104,6 +104,8 @@ class TestPreferences(PropertySheetTestC
"""
self.failUnless('Preference' in [x.getId() for x in
self.getPortal().portal_preferences.allowedContentTypes()])
+ self.failUnless('System Preference' in [x.getId() for x in
+ self.getPortal().portal_preferences.allowedContentTypes()])
def test_EnablePreferences(self):
""" tests preference workflow """
@@ -119,6 +121,7 @@ class TestPreferences(PropertySheetTestC
person1.portal_workflow.doActionFor(
person1, 'enable_action', wf_id='preference_workflow')
+ transaction.commit()
self.assertEquals(person1.getPreferenceState(), 'enabled')
self.assertEqual( person1, self.getPreferenceTool().getActivePreference())
@@ -146,6 +149,7 @@ class TestPreferences(PropertySheetTestC
portal_workflow.doActionFor(
person2, 'enable_action', wf_id='preference_workflow')
+ transaction.commit()
self.assertEqual(person2, self.getPreferenceTool().getActivePreference())
self.assertEqual(None,
self.getPreferenceTool().getActiveSystemPreference())
@@ -214,6 +218,7 @@ class TestPreferences(PropertySheetTestC
# disable person -> group is selected
self.getWorkflowTool().doActionFor(person1,
'disable_action', wf_id='preference_workflow')
+ transaction.commit()
self.assertEquals(list(pref_tool.getPreference(
'preferred_accounting_transaction_simulation_state_list')),
list(group.getPreferredAccountingTransactionSimulationStateList()))
More information about the Erp5-report
mailing list