from django.contrib.auth.admin import UserAdmin
from django.contrib.admin.widgets import FilteredSelectMultiple
from django.contrib.auth.forms import ReadOnlyPasswordHashField
-from django.contrib.auth.signals import user_logged_in
+from django.contrib.auth.signals import user_logged_in
+from django.utils import timezone
+import django_evolution
class ReadonlyTabularInline(admin.TabularInline):
class UserInline(admin.TabularInline):
model = User
+ fields = ['email', 'firstname', 'lastname']
extra = 0
class SliceInline(admin.TabularInline):
model = Slice
extra = 0
-class UserInline(admin.TabularInline):
- model = User
- extra = 0
-
class RoleInline(admin.TabularInline):
model = Role
extra = 0
model = Node
extra = 0
+class SitePrivilegeInline(admin.TabularInline):
+ model = SitePrivilege
+ extra = 0
+
+class SliceMembershipInline(admin.TabularInline):
+ model = SliceMembership
+ extra = 0
+
+class SliceTagInline(admin.TabularInline):
+ model = SliceTag
+ extra = 0
+
class PlainTextWidget(forms.HiddenInput):
input_type = 'hidden'
list_display = ('role_type',)
-class DeploymentNetworkAdminForm(forms.ModelForm):
+class DeploymentAdminForm(forms.ModelForm):
sites = forms.ModelMultipleChoiceField(
queryset=Site.objects.all(),
required=False,
)
)
class Meta:
- model = DeploymentNetwork
+ model = Deployment
def __init__(self, *args, **kwargs):
- super(DeploymentNetworkAdminForm, self).__init__(*args, **kwargs)
+ super(DeploymentAdminForm, self).__init__(*args, **kwargs)
if self.instance and self.instance.pk:
self.fields['sites'].initial = self.instance.sites.all()
def save(self, commit=True):
- deploymentNetwork = super(DeploymentNetworkAdminForm, self).save(commit=False)
+ deploymentNetwork = super(DeploymentAdminForm, self).save(commit=False)
if commit:
deploymentNetwork.save()
return deploymentNetwork
-class DeploymentNetworkAdmin(PlanetStackBaseAdmin):
- form = DeploymentNetworkAdminForm
- inlines = [NodeInline,]
+class DeploymentAdmin(PlanetStackBaseAdmin):
+ form = DeploymentAdminForm
+ inlines = [NodeInline,SliverInline]
def get_formsets(self, request, obj=None):
for inline in self.get_inline_instances(request, obj):
]
list_display = ('name', 'login_base','site_url', 'enabled')
filter_horizontal = ('deployments',)
- inlines = [NodeInline, UserInline]
+ inlines = [NodeInline, UserInline, SitePrivilegeInline]
search_fields = ['name']
def queryset(self, request):
# qs = super(KeyAdmin, self).queryset(request)
#else:
# qs = Key.objects.filter(user=request.user)
- #return qs
-
+ #return qs
+
class SliceAdmin(OSModelAdmin):
fields = ['name', 'site', 'serviceClass', 'description', 'slice_url']
list_display = ('name', 'site','serviceClass', 'slice_url')
- inlines = [SliverInline]
+ inlines = [SliverInline, SliceMembershipInline, SliceTagInline]
def queryset(self, request):
# admins can see all keys. Users can only see slices they belong to.
fields = ['image_id', 'name', 'disk_format', 'container_format']
class NodeAdmin(admin.ModelAdmin):
- list_display = ('name', 'site', 'deploymentNetwork')
- list_filter = ('deploymentNetwork',)
+ list_display = ('name', 'site', 'deployment')
+ list_filter = ('deployment',)
class SliverForm(forms.ModelForm):
#self.readonly_fields = ('ip', 'instance_name')
self.readonly_fields = ()
else:
- self.readonly_fields = ('ip', 'instance_name', 'slice', 'image', 'key')
+ self.readonly_fields = ()
+ #self.readonly_fields = ('ip', 'instance_name', 'slice', 'image', 'key')
for inline in self.get_inline_instances(request, obj):
# hide MyInline in the add view
# that reference specific fields on auth.User.
list_display = ('email', 'site', 'firstname', 'lastname', 'is_admin', 'last_login')
list_filter = ('site',)
+ inlines = [SitePrivilegeInline, SliceMembershipInline]
fieldsets = (
- (None, {'fields': ('email', 'password')}),
- ('Personal info', {'fields': ('firstname','lastname','phone', 'is_admin', 'site', 'key')}),
+ (None, {'fields': ('email', 'password', 'site', 'is_admin', 'timezone')}),
+ ('Personal info', {'fields': ('firstname','lastname','phone', 'key')}),
#('Important dates', {'fields': ('last_login',)}),
)
add_fieldsets = (
(None, {
'classes': ('wide',),
- 'fields': ('email', 'firstname', 'lastname', 'phone', 'site', 'is_admin', 'key','password1', 'password2')}
+ 'fields': ('email', 'firstname', 'lastname', 'phone', 'site', 'key','password1', 'password2', 'is_admin')}
),
)
search_fields = ('email',)
ordering = ('email',)
filter_horizontal = ()
+class ServiceResourceInline(admin.TabularInline):
+ model = ServiceResource
+ extra = 0
+
+class ServiceClassAdmin(admin.ModelAdmin):
+ list_display = ('name', 'commitment', 'membershipFee')
+ inlines = [ServiceResourceInline]
+
+class ReservedResourceInline(admin.TabularInline):
+ model = ReservedResource
+ extra = 0
+
+ def formfield_for_foreignkey(self, db_field, request=None, **kwargs):
+ field = super(ReservedResourceInline, self).formfield_for_foreignkey(db_field, request, **kwargs)
+
+ if db_field.name == 'resource':
+ # restrict resources to those that the slice's service class allows
+ if request._slice is not None:
+ field.queryset = field.queryset.filter(serviceClass = request._slice.serviceClass, calendarReservable=True)
+ if len(field.queryset) > 0:
+ field.initial = field.queryset.all()[0]
+ else:\r
+ field.queryset = field.queryset.none()\r
+ elif db_field.name == 'sliver':\r
+ # restrict slivers to those that belong to the slice\r
+ if request._slice is not None:\r
+ field.queryset = field.queryset.filter(slice = request._slice)
+ else:
+ field.queryset = field.queryset.none()\r
+\r
+ return field
+
+class ReservationChangeForm(forms.ModelForm):
+ class Meta:
+ model = Reservation
+
+class ReservationAddForm(forms.ModelForm):
+ slice = forms.ModelChoiceField(queryset=Slice.objects.all(), widget=forms.Select(attrs={"onChange":"document.getElementById('id_refresh').value=1; submit()"}))
+ refresh = forms.CharField(widget=forms.HiddenInput())
+
+ class Media:
+ css = {'all': ('planetstack.css',)} # .field-refresh { display: none; }
+
+ def clean_slice(self):
+ slice = self.cleaned_data.get("slice")
+ x = ServiceResource.objects.filter(serviceClass = slice.serviceClass, calendarReservable=True)
+ if len(x) == 0:
+ raise forms.ValidationError("The slice you selected does not have a service class that allows reservations")
+ return slice
+
+ class Meta:
+ model = Reservation
+
+class ReservationAddRefreshForm(ReservationAddForm):
+ """ This form is displayed when the Reservation Form receives an update
+ from the Slice dropdown onChange handler. It doesn't validate the
+ data and doesn't save the data. This will cause the form to be
+ redrawn.
+ """
+
+ """ don't validate anything other than slice """
+ dont_validate_fields = ("startTime", "duration")
+
+ def full_clean(self):
+ result = super(ReservationAddForm, self).full_clean()
+
+ for fieldname in self.dont_validate_fields:
+ if fieldname in self._errors:
+ del self._errors[fieldname]
+
+ return result
+
+ """ don't save anything """
+ def is_valid(self):
+ return False
+
+class ReservationAdmin(admin.ModelAdmin):
+ list_display = ('startTime', 'duration')
+ inlines = [ReservedResourceInline]
+ form = ReservationAddForm
+
+ def add_view(self, request, form_url='', extra_context=None):
+ timezone.activate(request.user.timezone)
+ request._refresh = False
+ request._slice = None
+ if request.method == 'POST':
+ # "refresh" will be set to "1" if the form was submitted due to
+ # a change in the Slice dropdown.
+ if request.POST.get("refresh","1") == "1":
+ request._refresh = True
+ request.POST["refresh"] = "0"
+
+ # Keep track of the slice that was selected, so the
+ # reservedResource inline can filter items for the slice.
+ request._slice = request.POST.get("slice",None)
+ if (request._slice is not None):
+ request._slice = Slice.objects.get(id=request._slice)
+
+ result = super(ReservationAdmin, self).add_view(request, form_url, extra_context)
+ return result
+
+ def changelist_view(self, request, extra_context = None):
+ timezone.activate(request.user.timezone)
+ return super(ReservationAdmin, self).changelist_view(request, extra_context)
+
+ def get_form(self, request, obj=None, **kwargs):
+ request._obj_ = obj\r
+ if obj is not None:\r
+ # For changes, set request._slice to the slice already set in the\r
+ # object.\r
+ request._slice = obj.slice\r
+ self.form = ReservationChangeForm\r
+ else:\r
+ if getattr(request, "_refresh", False):\r
+ self.form = ReservationAddRefreshForm\r
+ else:\r
+ self.form = ReservationAddForm\r
+ return super(ReservationAdmin, self).get_form(request, obj, **kwargs)\r
+\r
+ def get_readonly_fields(self, request, obj=None):
+ if (obj is not None):\r
+ # Prevent slice from being changed after the reservation has been\r
+ # created.\r
+ return ['slice']\r
+ else:\r
+ return []
+
# register a signal that caches the user's credentials when they log in
def cache_credentials(sender, user, request, **kwds):
auth = {'username': request.POST['username'],
# unregister the Group model from admin.
admin.site.unregister(Group)
+#Do not show django evolution in the admin interface
+from django_evolution.models import Version, Evolution
+admin.site.unregister(Version)
+admin.site.unregister(Evolution)
+
+
+# When debugging it is often easier to see all the classes, but for regular use
+# only the top-levels should be displayed
+showAll = False
+
+admin.site.register(Deployment, DeploymentAdmin)
admin.site.register(Site, SiteAdmin)
-#admin.site.register(SitePrivilege, SitePrivilegeAdmin)
admin.site.register(Slice, SliceAdmin)
-#admin.site.register(SliceMembership, SliceMembershipAdmin)
-#admin.site.register(Subnet, SubnetAdmin)
-admin.site.register(Image, ImageAdmin)
-#admin.site.register(Node, NodeAdmin)
-admin.site.register(Sliver, SliverAdmin)
+#admin.site.register(Subnet)
admin.site.register(Key, KeyAdmin)
-#admin.site.register(Role, RoleAdmin)
-admin.site.register(DeploymentNetwork, DeploymentNetworkAdmin)
+
+
+if showAll:
+ admin.site.register(Node, NodeAdmin)
+ admin.site.register(SliceMembership, SliceMembershipAdmin)
+ 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)
git://git.onelab.eu / plstackapi.git / blobdiff