X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plstackapi%2Fcore%2Fadmin.py;h=dae2256d3c88d562cddba326f4f80bdf8b0bd8ff;hb=31c2b8f8f7d25d3cd6f74b625a949f17d9fd62a2;hp=3dbf99ca779fd8bc3bec3e12443f3e6eade8e8e2;hpb=fd24d0d9d3d7a8664d2785a614c4e942f3b5e538;p=plstackapi.git diff --git a/plstackapi/core/admin.py b/plstackapi/core/admin.py index 3dbf99c..dae2256 100644 --- a/plstackapi/core/admin.py +++ b/plstackapi/core/admin.py @@ -1,10 +1,14 @@ from plstackapi.core.models import Site from plstackapi.core.models import * from django.contrib import admin -from django import forms +from django.contrib.auth.models import Group +from django import forms +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 class ReadonlyTabularInline(admin.TabularInline): @@ -25,6 +29,7 @@ class ReadonlyTabularInline(admin.TabularInline): class SliverInline(admin.TabularInline): model = Sliver + fields = ['ip', 'name', 'slice', 'flavor', 'image', 'key', 'node', 'deploymentNetwork'] extra = 0 class SiteInline(admin.TabularInline): @@ -82,6 +87,12 @@ class SiteAdmin(admin.ModelAdmin): inlines = [NodeInline,] search_fields = ['name'] +class KeyAdmin(admin.ModelAdmin): + fieldsets = [ + ('Key', {'fields': ['name', 'key', 'type', 'blacklisted', 'user']}) + ] + list_display = ['name', 'key', 'type', 'blacklisted', 'user'] + class SliceAdmin(PlanetStackBaseAdmin): fields = ['name', 'site', 'instantiation', 'description', 'slice_url'] list_display = ('name', 'site','slice_url', 'instantiation') @@ -89,6 +100,7 @@ class SliceAdmin(PlanetStackBaseAdmin): class SubnetAdmin(admin.ModelAdmin): fields = ['cidr', 'ip_version', 'start', 'end', 'slice'] + list_display = ('slice','cidr', 'start', 'end', 'ip_version' ) class ImageAdmin(admin.ModelAdmin): fields = ['image_id', 'name', 'disk_format', 'container_format'] @@ -97,22 +109,115 @@ class NodeAdmin(admin.ModelAdmin): list_display = ('name', 'site', 'deploymentNetwork') list_filter = ('deploymentNetwork',) +class RoleAdmin(admin.ModelAdmin): + fieldsets = [ + ('Role', {'fields': ['role_type']}) + ] + list_display = ('role_type',) +class PlainTextWidget(forms.Widget): + def render(self, _name, value, attrs): + return mark_safe(value) if value is not None else '' -class IgnoredField(forms.Field): - def validate(self, value): - return - +class SliverForm(forms.ModelForm): + class Meta: + ip = forms.CharField(widget=PlainTextWidget) + model = Sliver + widgets = { + 'ip': PlainTextWidget(), + } + +class SliverAdmin(admin.ModelAdmin): + form = SliverForm + fieldsets = [ + ('Sliver', {'fields': ['ip', 'name', 'slice', 'flavor', 'image', 'key', 'node', 'deploymentNetwork']}) + ] + list_display = ['ip', 'name', 'slice', 'flavor', 'image', 'key', 'node', 'deploymentNetwork'] +class UserCreationForm(forms.ModelForm): + """A form for creating new users. Includes all the required + fields, plus a repeated password.""" + password1 = forms.CharField(label='Password', widget=forms.PasswordInput) + password2 = forms.CharField(label='Password confirmation', widget=forms.PasswordInput) -class RoleForm(forms.ModelForm): - role_id = IgnoredField() - role_type = forms.CharField() + class Meta: + model = PLUser + fields = ('email', 'firstname', 'lastname', 'phone', 'site') + def clean_password2(self): + # Check that the two password entries match + password1 = self.cleaned_data.get("password1") + password2 = self.cleaned_data.get("password2") + if password1 and password2 and password1 != password2: + raise forms.ValidationError("Passwords don't match") + return password2 -class RoleAdmin(admin.ModelAdmin): - form = RoleForm - list_display = ('role_type',) + def save(self, commit=True): + # Save the provided password in hashed format + user = super(UserCreationForm, self).save(commit=False) + user.set_password(self.cleaned_data["password1"]) + if commit: + 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 + password hash display field. + """ + password = ReadOnlyPasswordHashField() + + class Meta: + model = PLUser + + def clean_password(self): + # Regardless of what the user provides, return the initial value. + # This is done here, rather than on the field, because the + # field does not have access to the initial value + return self.initial["password"] + + +class PLUserAdmin(UserAdmin): + class Meta: + app_label = "core" + + # The forms to add and change user instances + form = UserChangeForm + add_form = UserCreationForm + + # The fields to be used in displaying the User model. + # These override the definitions on the base UserAdmin + # that reference specific fields on auth.User. + list_display = ('email', 'site', 'firstname', 'lastname', 'last_login') + list_filter = ('site',) + fieldsets = ( + (None, {'fields': ('email', 'password')}), + ('Personal info', {'fields': ('firstname','lastname','phone','site')}), + #('Important dates', {'fields': ('last_login',)}), + ) + add_fieldsets = ( + (None, { + 'classes': ('wide',), + 'fields': ('email', 'firstname', 'lastname', 'phone', 'site', 'password1', 'password2')} + ), + ) + search_fields = ('email',) + ordering = ('email',) + filter_horizontal = () + +# 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'], + 'password': request.POST['password']} + request.session['auth'] = auth +user_logged_in.connect(cache_credentials) + +# Now register the new UserAdmin... +admin.site.register(PLUser, PLUserAdmin) +# ... and, since we're not using Django's builtin permissions, +# unregister the Group model from admin. +admin.site.unregister(Group) admin.site.register(Site, SiteAdmin) admin.site.register(SitePrivilege) @@ -121,10 +226,9 @@ admin.site.register(SliceMembership) admin.site.register(Subnet, SubnetAdmin) admin.site.register(Image, ImageAdmin) admin.site.register(Node, NodeAdmin) -admin.site.register(Sliver) +admin.site.register(Sliver, SliverAdmin) admin.site.register(Flavor) -admin.site.register(Key) +admin.site.register(Key, KeyAdmin) admin.site.register(Role, RoleAdmin) -admin.site.register(User) admin.site.register(DeploymentNetwork, DeploymentNetworkAdmin)