diff --git a/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_gadget/Base_setRssItemReadInSelection.xml b/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_gadget/Base_setRssItemReadInSelection.xml index 81551a399d123a5555908fa8c7b00ca001133dc2..0d1249f0614db8ff887214d0a60c56c2764f1b44 100644 --- a/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_gadget/Base_setRssItemReadInSelection.xml +++ b/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_gadget/Base_setRssItemReadInSelection.xml @@ -59,7 +59,7 @@ params = selection.getParams()\n readItemList = params.get(\'rss_read_item:list\', {})\n readItemList[item]=\'\'\n params[\'rss_read_item:list\'] = readItemList\n -portal_selection.setSelectionParamsFor(selection_name, {\'rss_read_item:list\':params[\'rss_read_item:list\']})\n +portal_selection.setSelectionParamsFor(selection_name, params)\n </string> </value> </item> <item> @@ -106,7 +106,6 @@ portal_selection.setSelectionParamsFor(selection_name, {\'rss_read_item:list\':p <string>params</string> <string>readItemList</string> <string>_write_</string> - <string>_getitem_</string> </tuple> </value> </item> diff --git a/bt5/erp5_knowledge_pad/bt/revision b/bt5/erp5_knowledge_pad/bt/revision index 2e790af68a8c3683ef466009ea9cea14a1ee2e46..430faa64e76e7478e4653bc318c717b548aa76e8 100644 --- a/bt5/erp5_knowledge_pad/bt/revision +++ b/bt5/erp5_knowledge_pad/bt/revision @@ -1 +1 @@ -510 \ No newline at end of file +511 \ No newline at end of file diff --git a/product/ERP5/tests/testXHTML.py b/product/ERP5/tests/testXHTML.py index 62eca0e82f1f9960eab403f66a9facf5fee36d7d..904ea9825d7a40d6a3ca708cfa17fff3069ebfc9 100644 --- a/product/ERP5/tests/testXHTML.py +++ b/product/ERP5/tests/testXHTML.py @@ -185,20 +185,23 @@ class TestXHTML(ERP5TypeTestCase): % '\n\t'.join(str(e) for e in error_list) self.fail(message) - @expectedFailure def test_configurationOfFieldLibrary(self): error_list = [] - for business_template in self.portal.portal_templates.searchFolder(): + for business_template in self.portal.portal_templates.searchFolder( + title=['erp5_trade']): # XXX Impossible to filter by installation state, as it is not catalogued business_template = business_template.getObject() for modifiable_field in business_template.BusinessTemplate_getModifiableFieldList(): - error_list.append((modifiable_field.object_id, - modifiable_field.choice_item_list[0][0])) + # Do not consider 'Check delegated values' as an error + if modifiable_field.choice_item_list[0][1] != \ + "0_check_delegated_value": + error_list.append((modifiable_field.object_id, + modifiable_field.choice_item_list[0][0])) if error_list: message = '%s fields to modify' % len(error_list) - #message += '\n\t' + '\n\t'.join(fieldname + ": " + message - # for fieldname, message in error_list) - self.fail(message) # uncomment above for details on each field + message += '\n\t' + '\n\t'.join(fieldname + ": " + message + for fieldname, message in error_list) + self.fail(message) def test_portalTypesDomainTranslation(self): # according to bt5-Module.Creation.Guidelines document, module