Merge "Fixed module filtering in 'modules' drop-down"

This commit is contained in:
Jenkins
2014-05-19 11:44:29 +00:00
committed by Gerrit Code Review
2 changed files with 3 additions and 2 deletions

View File

@@ -294,7 +294,7 @@ def get_modules_json(record_ids, query_filter, **kwargs):
add_modules = set([])
for module in six.itervalues(module_id_index):
if set(module['modules']) <= module_ids:
if set(module['modules']) & module_ids:
add_modules.add(module['id'])
module_ids |= add_modules

View File

@@ -61,7 +61,8 @@ class TestAPIModules(test_api.TestAPI):
modules = json.loads(response.data)['modules']
self.assertEqual(
[{'id': 'glance', 'text': 'glance', 'tag': 'module'},
{'id': 'nova', 'text': 'nova', 'tag': 'module'}],
{'id': 'nova', 'text': 'nova', 'tag': 'module'},
{'id': 'nova-group', 'text': 'nova-group', 'tag': 'group'}],
modules,
message='Expected modules belonging to project type plus '
'module groups that are completely within '