zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-04-18 05:51:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4610 from ryanpetrello/cli-cleanup-injectors-language

Browse Source 
fix a few minor CLI bugs

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2019-08-29 14:15:48 +00:00
committed by GitHub
parent 226d507013 a107a17bc9
commit 33f2b0bf1a
3 changed files with 39 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
awx/main/migrations/0087_v360_update_credential_injector_help_text.py Normal file
View File

@@ -0,0 +1,29 @@
# Generated by Django 2.2.4 on 2019-08-27 21:50
import awx.main.fields
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('main', '0086_v360_workflow_approval'),
]
operations = [
migrations.AlterField(
model_name='credential',
name='inputs',
field=awx.main.fields.CredentialInputField(blank=True, default=dict, help_text='Enter inputs using either JSON or YAML syntax. Refer to the Ansible Tower documentation for example syntax.'),
),
migrations.AlterField(
model_name='credentialtype',
name='injectors',
field=awx.main.fields.CredentialTypeInjectorField(blank=True, default=dict, help_text='Enter injectors using either JSON or YAML syntax. Refer to the Ansible Tower documentation for example syntax.'),
),
migrations.AlterField(
model_name='credentialtype',
name='inputs',
field=awx.main.fields.CredentialTypeInputField(blank=True, default=dict, help_text='Enter inputs using either JSON or YAML syntax. Refer to the Ansible Tower documentation for example syntax.'),
),
]

15
awx/main/models/credential/__init__.py
View File

@@ -106,9 +106,8 @@ class Credential(PasswordFieldsModel, CommonModelNameNotUnique, ResourceMixin):
inputs = CredentialInputField(
blank=True,
default=dict,
help_text=_('Enter inputs using either JSON or YAML syntax. Use the '
'radio button to toggle between the two. Refer to the '
'Ansible Tower documentation for example syntax.')
help_text=_('Enter inputs using either JSON or YAML syntax. '
'Refer to the Ansible Tower documentation for example syntax.')
)
admin_role = ImplicitRoleField(
parent_role=[
@@ -344,16 +343,14 @@ class CredentialType(CommonModelNameNotUnique):
inputs = CredentialTypeInputField(
blank=True,
default=dict,
help_text=_('Enter inputs using either JSON or YAML syntax. Use the '
'radio button to toggle between the two. Refer to the '
'Ansible Tower documentation for example syntax.')
help_text=_('Enter inputs using either JSON or YAML syntax. '
'Refer to the Ansible Tower documentation for example syntax.')
)
injectors = CredentialTypeInjectorField(
blank=True,
default=dict,
help_text=_('Enter injectors using either JSON or YAML syntax. Use the '
'radio button to toggle between the two. Refer to the '
'Ansible Tower documentation for example syntax.')
help_text=_('Enter injectors using either JSON or YAML syntax. '
'Refer to the Ansible Tower documentation for example syntax.')
)
@classmethod