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

AC-537 Fix admin/API breakage as a result of database changes.

Browse Source
This commit is contained in:
Chris Church
2013-10-29 11:41:11 -04:00
parent e9b037af34
commit ddd5eb3b4e
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/main/admin.py
View File

@@ -160,7 +160,7 @@ class CredentialAdmin(BaseModelAdmin):
fieldsets = ( fieldsets = (
(None, {'fields': (('name', 'active'), ('user', 'team'), 'description')}), (None, {'fields': (('name', 'active'), ('user', 'team'), 'description')}),
(_('Auth Info'), {'fields': (('ssh_username', 'ssh_password'), (_('Auth Info'), {'fields': (('username', 'password'),
'ssh_key_data', 'ssh_key_unlock', 'ssh_key_data', 'ssh_key_unlock',
('sudo_username', 'sudo_password'))}), ('sudo_username', 'sudo_password'))}),
(_('Tags'), {'fields': ('tags',)}), (_('Tags'), {'fields': ('tags',)}),
@@ -288,10 +288,10 @@ class JobEventInlineForJob(JobEventInline):
class JobAdmin(BaseModelAdmin): class JobAdmin(BaseModelAdmin):
list_display = ('name', 'job_template', 'project', 'playbook', 'status') list_display = ('__unicode__', 'job_template', 'project', 'playbook', 'status')
list_filter = ('status',) list_filter = ('status',)
fieldsets = ( fieldsets = (
(None, {'fields': ('name', 'job_template', 'description')}), (None, {'fields': ('job_template', 'description')}),
(_('Job Parameters'), {'fields': ('inventory', 'project', 'playbook', (_('Job Parameters'), {'fields': ('inventory', 'project', 'playbook',
'credential', 'job_type')}), 'credential', 'job_type')}),
(_('More Options'), {'fields': ('forks', 'limit', 'verbosity', (_('More Options'), {'fields': ('forks', 'limit', 'verbosity',
@@ -316,7 +316,7 @@ class JobAdmin(BaseModelAdmin):
def get_readonly_fields(self, request, obj=None): def get_readonly_fields(self, request, obj=None):
ro_fields = list(super(JobAdmin, self).get_readonly_fields(request, obj)) ro_fields = list(super(JobAdmin, self).get_readonly_fields(request, obj))
if obj and obj.pk and obj.status != 'new': if obj and obj.pk and obj.status != 'new':
ro_fields.extend(['name', 'description', 'job_template', ro_fields.extend(['description', 'job_template',
'inventory', 'project', 'playbook', 'credential', 'inventory', 'project', 'playbook', 'credential',
'job_type', 'forks', 'limit', 'job_type', 'forks', 'limit',
'verbosity', 'extra_vars', 'job_tags']) 'verbosity', 'extra_vars', 'job_tags'])

2
awx/main/serializers.py
View File

@@ -851,7 +851,7 @@ class CredentialSerializer(BaseSerializer):
class Meta: class Meta:
model = Credential model = Credential
fields = BASE_FIELDS + ('kind', 'ssh_username', 'ssh_password', 'ssh_key_data', fields = BASE_FIELDS + ('kind', 'username', 'password', 'ssh_key_data',
'ssh_key_unlock', 'sudo_username', 'ssh_key_unlock', 'sudo_username',
'sudo_password', 'user', 'team',) 'sudo_password', 'user', 'team',)