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

AC-537 Minor migration change, fix broken models/serializers.

Browse Source
This commit is contained in:
Chris Church
2013-10-29 12:06:48 -04:00
parent ddd5eb3b4e
commit 0c98b7ed69
5 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
awx/main/models/__init__.py
View File

@@ -1050,7 +1050,7 @@ class Credential(CommonModelNameNotUnique):
('rax', _('Rackspace')),
]
PASSWORD_FIELDS = ('ssh_password', 'password', 'ssh_key_data', 'ssh_key_unlock', 'sudo_password')
PASSWORD_FIELDS = ('password', 'ssh_key_data', 'ssh_key_unlock', 'sudo_password')
class Meta:
app_label = 'main'
@@ -1075,7 +1075,7 @@ class Credential(CommonModelNameNotUnique):
kind = models.CharField(
max_length=32,
choices=KIND_CHOICES,
default='machine',
default='ssh',
)
#ssh_username = models.CharField(
@@ -1134,8 +1134,8 @@ class Credential(CommonModelNameNotUnique):
)
@property
def needs_ssh_password(self):
return not self.ssh_key_data and self.ssh_password == 'ASK'
def needs_password(self):
return not self.ssh_key_data and self.password == 'ASK'
@property
def needs_ssh_key_unlock(self):
@@ -1149,7 +1149,7 @@ class Credential(CommonModelNameNotUnique):
@property
def passwords_needed(self):
needed = []
for field in ('ssh_password', 'sudo_password', 'ssh_key_unlock'):
for field in ('password', 'sudo_password', 'ssh_key_unlock'):
if getattr(self, 'needs_%s' % field):
needed.append(field)
return needed
@@ -1552,6 +1552,9 @@ class ProjectUpdate(CommonTask):
editable=False,
)
def get_absolute_url(self):
return reverse('main:project_update_detail', args=(self.pk,))
def _get_parent_instance(self):
return self.project