Update API/admin to accept either JSON or YAML for inventory/host/group variables.

This commit is contained in:
Chris Church
2013-06-19 01:39:34 -04:00
parent 9c6a20d4c7
commit 85a483a6fb
9 changed files with 210 additions and 57 deletions

View File

@@ -80,6 +80,7 @@ class InventoryAdmin(BaseModelAdmin):
list_display = ('name', 'organization', 'description', 'active')
list_filter = ('organization', 'active')
form = InventoryAdminForm
fieldsets = (
(None, {'fields': (('name', 'active'), 'organization', 'description',
'variables')}),
@@ -89,17 +90,6 @@ class InventoryAdmin(BaseModelAdmin):
readonly_fields = ('created', 'created_by')
inlines = [InventoryHostInline, InventoryGroupInline]
#class TagAdmin(BaseModelAdmin):
#
# list_display = ('name',)
#class AuditTrailAdmin(admin.ModelAdmin):
#
# list_display = ('name', 'description', 'active')
# not currently on model, so disabling for now.
# filter_horizontal = ('tags',)
class JobHostSummaryInline(admin.TabularInline):
model = JobHostSummary
@@ -140,6 +130,7 @@ class HostAdmin(BaseModelAdmin):
list_display = ('name', 'inventory', 'description', 'active')
list_filter = ('inventory', 'active')
form = HostAdminForm
fieldsets = (
(None, {'fields': (('name', 'active'), 'inventory', 'description',
'variables',
@@ -154,6 +145,7 @@ class HostAdmin(BaseModelAdmin):
class GroupAdmin(BaseModelAdmin):
list_display = ('name', 'description', 'active')
form = GroupAdminForm
fieldsets = (
(None, {'fields': (('name', 'active'), 'inventory', 'description',
'parents', 'variables')}),