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

Various JT.organization cleanup items

Browse Source 
cleanup from PR review suggestions

bump migration number

fix test

revert change to old-app JT form no longer needed
This commit is contained in:
AlanCoding
2020-02-06 11:37:45 -05:00
parent 7547793792
commit aa4842aea5
9 changed files with 5 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -584,8 +584,8 @@ class ProjectUpdate(UnifiedJob, ProjectOptions, JobNotificationMixin, TaskManage
@property
def preferred_instance_groups(self):
if self.project is not None and self.project.organization is not None:
organization_groups = [x for x in self.project.organization.instance_groups.all()]
if self.organization is not None:
organization_groups = [x for x in self.organization.instance_groups.all()]
else:
organization_groups = []
template_groups = [x for x in super(ProjectUpdate, self).preferred_instance_groups]