Merge branch 'admin-users'

RIGS/admin.py

@@ -1,9 +1,10 @@
 from django.contrib import admin
-from RIGS import models
+from RIGS import models, forms
+from django.contrib.auth.admin import UserAdmin
+from django.utils.translation import ugettext_lazy as _
 import reversion
 
 # Register your models here.
-admin.site.register(models.Profile)
 admin.site.register(models.Person, reversion.VersionAdmin)
 admin.site.register(models.Organisation, reversion.VersionAdmin)
 admin.site.register(models.VatRate, reversion.VersionAdmin)
@@ -11,4 +12,25 @@ admin.site.register(models.Venue, reversion.VersionAdmin)
 admin.site.register(models.Event, reversion.VersionAdmin)
 admin.site.register(models.EventItem, reversion.VersionAdmin)
 admin.site.register(models.Invoice)
-admin.site.register(models.Payment)
+admin.site.register(models.Payment)
+
+class ProfileAdmin(UserAdmin):
+    fieldsets = (
+        (None, {'fields': ('username', 'password')}),
+        (_('Personal info'), {
+         'fields': ('first_name', 'last_name', 'email', 'initials', 'phone')}),
+        (_('Permissions'), {'fields': ('is_active', 'is_staff', 'is_superuser',
+                                       'groups', 'user_permissions')}),
+        (_('Important dates'), {
+         'fields': ('last_login', 'date_joined')}),
+    )
+    add_fieldsets = (
+        (None, {
+            'classes': ('wide',),
+            'fields': ('username', 'password1', 'password2'),
+        }),
+    )
+    form = forms.ProfileChangeForm
+    add_form = forms.ProfileCreationForm
+
+admin.site.register(models.Profile, ProfileAdmin)

RIGS/forms.py

@@ -3,7 +3,7 @@ from django import forms
 from django.utils import formats
 from django.conf import settings
 from django.core import serializers
-from django.contrib.auth.forms import AuthenticationForm, PasswordResetForm
+from django.contrib.auth.forms import UserCreationForm, UserChangeForm, AuthenticationForm, PasswordResetForm
 from registration.forms import RegistrationFormUniqueEmail 
 from captcha.fields import ReCaptchaField
 import simplejson
@@ -33,6 +33,17 @@ class LoginForm(AuthenticationForm):
 class PasswordReset(PasswordResetForm):
     captcha = ReCaptchaField(label='Captcha')
 
+class ProfileCreationForm(UserCreationForm):
+
+    class Meta(UserCreationForm.Meta):
+        model = models.Profile
+
+
+class ProfileChangeForm(UserChangeForm):
+
+    class Meta(UserChangeForm.Meta):
+        model = models.Profile
+
 # Events Shit
 class EventForm(forms.ModelForm):
     datetime_input_formats = formats.get_format_lazy("DATETIME_INPUT_FORMATS") + settings.DATETIME_INPUT_FORMATS