git://git.onelab.eu
/
plstackapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make reservations visible and hide the enacted fields
[plstackapi.git]
/
planetstack
/
core
/
admin.py
diff --git
a/planetstack/core/admin.py
b/planetstack/core/admin.py
index
76810f6
..
60a589c
100644
(file)
--- a/
planetstack/core/admin.py
+++ b/
planetstack/core/admin.py
@@
-46,6
+46,7
@@
class SliverInline(PlStackTabularInline):
#readonly_fields = ['ip', 'instance_name', 'image']
readonly_fields = ['ip', 'instance_name']
#readonly_fields = ['ip', 'instance_name', 'image']
readonly_fields = ['ip', 'instance_name']
+
class SiteInline(PlStackTabularInline):
model = Site
extra = 0
class SiteInline(PlStackTabularInline):
model = Site
extra = 0
@@
-142,6
+143,7
@@
class RoleAdmin(PlanetStackBaseAdmin):
]
list_display = ('role_type',)
]
list_display = ('role_type',)
+
class DeploymentAdminForm(forms.ModelForm):
sites = forms.ModelMultipleChoiceField(
queryset=Site.objects.all(),
class DeploymentAdminForm(forms.ModelForm):
sites = forms.ModelMultipleChoiceField(
queryset=Site.objects.all(),
@@
-188,8
+190,7
@@
class DeploymentAdmin(PlanetStackBaseAdmin):
class SiteAdmin(PlanetStackBaseAdmin):
fieldsets = [
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')
('Deployment Networks', {'fields': ['deployments']})
]
list_display = ('name', 'login_base','site_url', 'enabled')
@@
-372,6
+373,7
@@
class SliceMembershipAdmin(PlanetStackBaseAdmin):
obj.os_manager = OpenStackManager(auth=auth, caller=request.user)
obj.delete()
obj.os_manager = OpenStackManager(auth=auth, caller=request.user)
obj.delete()
+
class ImageAdmin(admin.ModelAdmin):
fields = ['image_id', 'name', 'disk_format', 'container_format']
class ImageAdmin(admin.ModelAdmin):
fields = ['image_id', 'name', 'disk_format', 'container_format']
@@
-380,6
+382,7
@@
class NodeAdmin(admin.ModelAdmin):
list_filter = ('deployment',)
inlines = [TagInline]
list_filter = ('deployment',)
inlines = [TagInline]
+
class SliverForm(forms.ModelForm):
class Meta:
model = Sliver
class SliverForm(forms.ModelForm):
class Meta:
model = Sliver
@@
-486,6
+489,7
@@
class UserCreationForm(forms.ModelForm):
user.save()
return user
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
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
@@
class UserChangeForm(forms.ModelForm):
# field does not have access to the initial value
return self.initial["password"]
# field does not have access to the initial value
return self.initial["password"]
+
class UserAdmin(UserAdmin):
class Meta:
app_label = "core"
class UserAdmin(UserAdmin):
class Meta:
app_label = "core"
@@
-552,6
+557,7
@@
class ServiceClassAdmin(admin.ModelAdmin):
inlines = [ServiceResourceInline]
class ReservedResourceInline(admin.TabularInline):
inlines = [ServiceResourceInline]
class ReservedResourceInline(admin.TabularInline):
+ exclude = ['enacted']
model = ReservedResource
extra = 0
model = ReservedResource
extra = 0
@@
-620,6
+626,7
@@
class ReservationAddRefreshForm(ReservationAddForm):
return False
class ReservationAdmin(admin.ModelAdmin):
return False
class ReservationAdmin(admin.ModelAdmin):
+ exclude = ['enacted']
list_display = ('startTime', 'duration')
inlines = [ReservedResourceInline]
form = ReservationAddForm
list_display = ('startTime', 'duration')
inlines = [ReservedResourceInline]
form = ReservationAddForm
@@
-697,6
+704,8
@@
admin.site.register(Deployment, DeploymentAdmin)
admin.site.register(Site, SiteAdmin)
admin.site.register(Slice, SliceAdmin)
admin.site.register(Project, ProjectAdmin)
admin.site.register(Site, SiteAdmin)
admin.site.register(Slice, SliceAdmin)
admin.site.register(Project, ProjectAdmin)
+admin.site.register(ServiceClass, ServiceClassAdmin)
+admin.site.register(Reservation, ReservationAdmin)
if showAll:
admin.site.register(Tag, TagAdmin)
if showAll:
admin.site.register(Tag, TagAdmin)
@@
-705,7
+714,5
@@
if showAll:
admin.site.register(SitePrivilege, SitePrivilegeAdmin)
admin.site.register(Role, RoleAdmin)
admin.site.register(Sliver, SliverAdmin)
admin.site.register(SitePrivilege, SitePrivilegeAdmin)
admin.site.register(Role, RoleAdmin)
admin.site.register(Sliver, SliverAdmin)
- admin.site.register(ServiceClass, ServiceClassAdmin)
- admin.site.register(Reservation, ReservationAdmin)
admin.site.register(Image, ImageAdmin)
admin.site.register(Image, ImageAdmin)