Commit c13e7a78 authored by Julien Muchembled's avatar Julien Muchembled

Fix order of rules returned by RuleTool.searchRuleList

This fixes a regression introduced in 77d94dd5
("Speed up RuleTool.searchRuleList by quickly filtering out rules"),
causing TestRule.test_09_expandTwoRules to fail.
parent 88cd569b
...@@ -100,7 +100,7 @@ class RuleTool(BaseTool): ...@@ -100,7 +100,7 @@ class RuleTool(BaseTool):
rule_uid_list = [] rule_uid_list = []
for rule in portal.portal_catalog.unrestrictedSearchResults( for rule in portal.portal_catalog.unrestrictedSearchResults(
portal_type=portal.getPortalRuleTypeList(), portal_type=portal.getPortalRuleTypeList(),
validation_state="validated", **kw): #XXX "validated" is hardcoded validation_state="validated"): #XXX "validated" is hardcoded
rule = rule.getObject() rule = rule.getObject()
try: try:
for test_method_id in rule.getTestMethodIdList(): for test_method_id in rule.getTestMethodIdList():
...@@ -118,7 +118,7 @@ class RuleTool(BaseTool): ...@@ -118,7 +118,7 @@ class RuleTool(BaseTool):
return rule_uid_list and portal.portal_domains._searchPredicateList( return rule_uid_list and portal.portal_domains._searchPredicateList(
context=movement, uid=rule_uid_list, context=movement, uid=rule_uid_list,
tested_base_category_list=tested_base_category_list) tested_base_category_list=tested_base_category_list, **kw)
InitializeClass(RuleTool) InitializeClass(RuleTool)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment