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

use Options models to consolidate field_names list

Browse Source
This commit is contained in:
AlanCoding
2017-12-13 18:11:37 -05:00
parent 2fb0144914
commit e188692acf
5 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/main/models/inventory.py
View File

@@ -1364,9 +1364,9 @@ class InventorySource(UnifiedJobTemplate, InventorySourceOptions):
@classmethod @classmethod
def _get_unified_job_field_names(cls): def _get_unified_job_field_names(cls):
return ['name', 'description', 'source', 'source_path', 'source_script', 'source_vars', 'schedule', return set(f.name for f in InventorySourceOptions._meta.fields) | set(
'credential', 'source_regions', 'instance_filters', 'group_by', 'overwrite', 'overwrite_vars', ['name', 'description', 'schedule']
'timeout', 'verbosity', 'source_project_update',] )
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
# If update_fields has been specified, add our field names to it, # If update_fields has been specified, add our field names to it,

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

@@ -289,13 +289,9 @@ class JobTemplate(UnifiedJobTemplate, JobOptions, SurveyJobTemplateMixin, Resour
@classmethod @classmethod
def _get_unified_job_field_names(cls): def _get_unified_job_field_names(cls):
return ['name', 'description', 'job_type', 'inventory', 'project', return set(f.name for f in JobOptions._meta.fields) | set(
'playbook', 'credentials', 'forks', 'schedule', 'limit', ['name', 'description', 'schedule', 'survey_passwords', 'labels', 'credentials']
'verbosity', 'job_tags', 'extra_vars', )
'force_handlers', 'skip_tags', 'start_at_task',
'become_enabled', 'labels', 'survey_passwords',
'allow_simultaneous', 'timeout', 'use_fact_cache',
'diff_mode',]
@property @property
def validation_errors(self): def validation_errors(self):

6
awx/main/models/projects.py
View File

@@ -306,9 +306,9 @@ class Project(UnifiedJobTemplate, ProjectOptions, ResourceMixin):
@classmethod @classmethod
def _get_unified_job_field_names(cls): def _get_unified_job_field_names(cls):
return ['name', 'description', 'local_path', 'scm_type', 'scm_url', return set(f.name for f in ProjectOptions._meta.fields) | set(
'scm_branch', 'scm_clean', 'scm_delete_on_update', ['name', 'description', 'schedule']
'credential', 'schedule', 'timeout',] )
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
new_instance = not bool(self.pk) new_instance = not bool(self.pk)

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

@@ -838,7 +838,7 @@ class UnifiedJob(PolymorphicModel, PasswordFieldsModel, CommonModelNameNotUnique
unified_job_class = self.__class__ unified_job_class = self.__class__
unified_jt_class = self._get_unified_job_template_class() unified_jt_class = self._get_unified_job_template_class()
parent_field_name = unified_job_class._get_parent_field_name() parent_field_name = unified_job_class._get_parent_field_name()
fields = unified_jt_class._get_unified_job_field_names() + [parent_field_name] fields = unified_jt_class._get_unified_job_field_names() | set([parent_field_name])
create_data = {"launch_type": "relaunch"} create_data = {"launch_type": "relaunch"}
if limit: if limit:

9
awx/main/models/workflow.py
View File

@@ -316,15 +316,16 @@ class WorkflowJobTemplate(UnifiedJobTemplate, WorkflowJobOptions, SurveyJobTempl
@classmethod @classmethod
def _get_unified_job_field_names(cls): def _get_unified_job_field_names(cls):
return ['name', 'description', 'extra_vars', 'labels', 'survey_passwords', return set(f.name for f in WorkflowJobOptions._meta.fields) | set(
'schedule', 'launch_type', 'allow_simultaneous'] ['name', 'description', 'schedule', 'survey_passwords', 'labels']
)
@classmethod @classmethod
def _get_unified_jt_copy_names(cls): def _get_unified_jt_copy_names(cls):
base_list = super(WorkflowJobTemplate, cls)._get_unified_jt_copy_names() base_list = super(WorkflowJobTemplate, cls)._get_unified_jt_copy_names()
base_list.remove('labels') base_list.remove('labels')
return (base_list + return (base_list |
['survey_spec', 'survey_enabled', 'ask_variables_on_launch', 'organization']) set(['survey_spec', 'survey_enabled', 'ask_variables_on_launch', 'organization']))
def get_absolute_url(self, request=None): def get_absolute_url(self, request=None):
return reverse('api:workflow_job_template_detail', kwargs={'pk': self.pk}, request=request) return reverse('api:workflow_job_template_detail', kwargs={'pk': self.pk}, request=request)