External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-20 23:37:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Making labels additive and not adding a many item to config if already in parent

Browse Source
This commit is contained in:
John Westcott IV
2022-09-09 12:11:14 -04:00
committed by Alan Rominger
parent 68e11d2b81
commit e076f1ee2a
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/main/models/jobs.py
View File

@@ -976,11 +976,11 @@ class LaunchTimeConfigBase(BaseModel):
if isinstance(field, models.ManyToManyField):
if not self.pk:
continue # unsaved object can't have related many-to-many
prompt_val = set(getattr(self, prompt_name).all())
if len(prompt_val) > 0:
# We used to return a set but that will cause issues with order for ordered fields (like instance_groups)
# So instead we will return an array of items
data[prompt_name] = [item for item in getattr(self, prompt_name).all()]
prompt_values = list(getattr(self, prompt_name).all())
# Many to manys can't distinguish between None and []
# Because of this, from a config perspective, we assume [] is none and we don't save [] into the config
if len(prompt_values) > 0:
data[prompt_name] = prompt_values
elif prompt_name == 'extra_vars':
if self.extra_vars:
if display: