External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-11 01:57:35 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10251 from kdelee/options_ee

Browse Source 
tweak message about image pull option

SUMMARY

I'm not sure if it is OK to change the migration in this way.
This message in the UI didn't make sense to me. If you all prefer the existing message, that is fine...I just think it is weird and doesn't tell you what it does.
If I don't care, I can leave it on --------- in the UI which is "do whatever the default is"
If I do care, its weird to choose an option saying I don't choose and option.

Reviewed-by: Bianca Henderson <beeankha@gmail.com>
Reviewed-by: Jeff Bradberry <None>
This commit is contained in:
softwarefactory-project-zuul[bot] 2021-05-25 16:19:41 +00:00 committed by GitHub
commit f2cd630a90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/migrations/0126_executionenvironment_container_options.py
View File

@ -16,7 +16,7 @@ class Migration(migrations.Migration):
field=models.CharField(
choices=[
('always', 'Always pull container before running.'),
('missing', 'No pull option has been selected.'),
('missing', 'Only pull the image if not present before running.'),
('never', 'Never pull container before running.'),
],
blank=True,

2
awx/main/models/execution_environments.py
View File

@ -14,7 +14,7 @@ class ExecutionEnvironment(CommonModel):
PULL_CHOICES = [
('always', _("Always pull container before running.")),
('missing', _("No pull option has been selected.")),
('missing', _("Only pull the image if not present before running.")),
('never', _("Never pull container before running.")),
]