X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fcore%2Fadmin.py;h=bc49b8a8deeebfdb2198c6c371041d86e36ae066;hb=acd45144b5e0fe049a61c4dcc826af934135e943;hp=a4295205c86a6d30e76f731986ae5fce87338700;hpb=47ae1b51a8639f63e2a9785126dbd7b87fe99d66;p=plstackapi.git diff --git a/planetstack/core/admin.py b/planetstack/core/admin.py index a429520..bc49b8a 100644 --- a/planetstack/core/admin.py +++ b/planetstack/core/admin.py @@ -9,7 +9,8 @@ from django.utils.safestring import mark_safe 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 class ReadonlyTabularInline(admin.TabularInline): @@ -222,8 +223,8 @@ class KeyAdmin(OSModelAdmin): # 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') @@ -337,7 +338,8 @@ class SliverAdmin(PlanetStackBaseAdmin): #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 @@ -423,20 +425,147 @@ class UserAdmin(UserAdmin, OSModelAdmin): list_filter = ('site',) inlines = [SitePrivilegeInline, SliceMembershipInline] fieldsets = ( - (None, {'fields': ('email', 'password', 'site')}), + (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', '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: + field.queryset = field.queryset.none() + elif db_field.name == 'sliver': + # restrict slivers to those that belong to the slice + if request._slice is not None: + field.queryset = field.queryset.filter(slice = request._slice) + else: + field.queryset = field.queryset.none() + + 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 + if obj is not None: + # For changes, set request._slice to the slice already set in the + # object. + request._slice = obj.slice + self.form = ReservationChangeForm + else: + if getattr(request, "_refresh", False): + self.form = ReservationAddRefreshForm + else: + self.form = ReservationAddForm + return super(ReservationAdmin, self).get_form(request, obj, **kwargs) + + def get_readonly_fields(self, request, obj=None): + if (obj is not None): + # Prevent slice from being changed after the reservation has been + # created. + return ['slice'] + else: + 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'], @@ -461,4 +590,6 @@ admin.site.register(Sliver, SliverAdmin) admin.site.register(Key, KeyAdmin) admin.site.register(Role, RoleAdmin) admin.site.register(DeploymentNetwork, DeploymentNetworkAdmin) +admin.site.register(ServiceClass, ServiceClassAdmin) +admin.site.register(Reservation, ReservationAdmin)