Skip to content

Commit 01e40b0

Browse files
author
JoanBoronat
committed
Deploy filters for project groups
1 parent 80fdff7 commit 01e40b0

File tree

1 file changed

+13
-8
lines changed

1 file changed

+13
-8
lines changed

api/filters/views.py

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -266,17 +266,22 @@ def filter_deploy(request, filter_id, project_id, container=None, swift_object=N
266266
if params['execution_server_reverse'] != 'default':
267267
policy_data['execution_server_reverse'] = params['execution_server_reverse']
268268

269-
# TODO: Try to improve this part
270-
if container and swift_object:
271-
target = os.path.join(project_id, container, swift_object)
272-
elif container:
273-
target = os.path.join(project_id, container)
269+
if project_id.startswith('group_'):
270+
projects_id = json.loads(r.hgetall('project_group:' + project_id.split('_')[1])['attached_projects'])
274271
else:
275-
target = project_id
272+
projects_id = [project_id]
276273

277274
try:
278-
token = get_token_connection(request)
279-
set_filter(r, target, filter_data, policy_data, token)
275+
for project in projects_id:
276+
if container and swift_object:
277+
target = os.path.join(project, container, swift_object)
278+
elif container:
279+
target = os.path.join(project, container)
280+
else:
281+
target = project
282+
283+
token = get_token_connection(request)
284+
set_filter(r, target, filter_data, policy_data, token)
280285

281286
return JSONResponse(policy_id, status=status.HTTP_201_CREATED)
282287

0 commit comments

Comments
 (0)