External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-12 15:14:45 -03:30
Code Issues Packages Projects Releases Wiki Activity

i18n changes.

Browse Source
This commit is contained in:
Aaron Tan
2016-11-01 15:35:54 -04:00
parent ff1fdb4f5b
commit d1ec44f20a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/api/views.py
View File

@@ -2660,7 +2660,7 @@ class WorkflowJobTemplateNodeChildrenBaseList(EnforceParentRelationshipMixin, Su
mutex_list = ('success_nodes', 'failure_nodes') if self.relationship == 'always_nodes' else ('always_nodes',) mutex_list = ('success_nodes', 'failure_nodes') if self.relationship == 'always_nodes' else ('always_nodes',)
for relation in mutex_list: for relation in mutex_list:
if getattr(parent, relation).all().exists(): if getattr(parent, relation).all().exists():
return {'Error': 'Cannot associate {0} when {1} have been associated.'.format(self.relationship, relation)} return {'Error': _('Cannot associate {0} when {1} have been associated.'.format(self.relationship, relation))}
if created: if created:
return None return None
@@ -2685,11 +2685,11 @@ class WorkflowJobTemplateNodeChildrenBaseList(EnforceParentRelationshipMixin, Su
sub_node = graph[sub.pk] sub_node = graph[sub.pk]
parent_node = graph[parent.pk] parent_node = graph[parent.pk]
if sub_node['metadata']['parent'] is not None: if sub_node['metadata']['parent'] is not None:
return {"Error": "Multiple parent relationship not allowed."} return {"Error": _("Multiple parent relationship not allowed.")}
iter_node = parent_node iter_node = parent_node
while iter_node is not None: while iter_node is not None:
if iter_node == sub_node: if iter_node == sub_node:
return {"Error": "Cycle detected."} return {"Error": _("Cycle detected.")}
iter_node = iter_node['metadata']['parent'] iter_node = iter_node['metadata']['parent']
return None return None