Merge branch 'devel' into copy_awx_collection

This commit is contained in:
Sean Sullivan
2021-03-12 15:26:59 -06:00
committed by GitHub
19 changed files with 619 additions and 228 deletions

View File

@@ -149,19 +149,19 @@ def main():
# Create the data that gets sent for create and update
new_fields = {}
if username:
if username is not None:
new_fields['username'] = module.get_item_name(existing_item) if existing_item else username
if first_name:
if first_name is not None:
new_fields['first_name'] = first_name
if last_name:
if last_name is not None:
new_fields['last_name'] = last_name
if email:
if email is not None:
new_fields['email'] = email
if is_superuser:
if is_superuser is not None:
new_fields['is_superuser'] = is_superuser
if is_system_auditor:
if is_system_auditor is not None:
new_fields['is_system_auditor'] = is_system_auditor
if password:
if password is not None:
new_fields['password'] = password
# If the state was present and we can let the module build or update the existing item, this will return on its own