Added in geoposition for Sites, including google map display. Redid fixtures to include new fields (enacted), and formatted (prettyprint) serviceclass_initial_data.json for comparison.
diff --git a/planetstack/core/admin.py b/planetstack/core/admin.py
index 76810f6..8debfb2 100644
--- a/planetstack/core/admin.py
+++ b/planetstack/core/admin.py
@@ -46,6 +46,7 @@
#readonly_fields = ['ip', 'instance_name', 'image']
readonly_fields = ['ip', 'instance_name']
+
class SiteInline(PlStackTabularInline):
model = Site
extra = 0
@@ -142,6 +143,7 @@
]
list_display = ('role_type',)
+
class DeploymentAdminForm(forms.ModelForm):
sites = forms.ModelMultipleChoiceField(
queryset=Site.objects.all(),
@@ -188,8 +190,7 @@
class SiteAdmin(PlanetStackBaseAdmin):
fieldsets = [
- (None, {'fields': ['name', 'site_url', 'enabled', 'is_public', 'login_base']}),
- ('Location', {'fields': ['latitude', 'longitude']}),
+ (None, {'fields': ['name', 'site_url', 'enabled', 'is_public', 'login_base', 'location']}),
('Deployment Networks', {'fields': ['deployments']})
]
list_display = ('name', 'login_base','site_url', 'enabled')
@@ -372,6 +373,7 @@
obj.os_manager = OpenStackManager(auth=auth, caller=request.user)
obj.delete()
+
class ImageAdmin(admin.ModelAdmin):
fields = ['image_id', 'name', 'disk_format', 'container_format']
@@ -380,6 +382,7 @@
list_filter = ('deployment',)
inlines = [TagInline]
+
class SliverForm(forms.ModelForm):
class Meta:
model = Sliver
@@ -486,6 +489,7 @@
user.save()
return user
+
class UserChangeForm(forms.ModelForm):
"""A form for updating users. Includes all the fields on
the user, but replaces the password field with admin's
@@ -502,6 +506,7 @@
# field does not have access to the initial value
return self.initial["password"]
+
class UserAdmin(UserAdmin):
class Meta:
app_label = "core"