Fixed bug with account admin

shelfzilla/apps/account/admin.py

@@ -10,10 +10,8 @@ from __future__ import absolute_import, unicode_literals
 import logging
 
 # django imports
-from django import forms
 from django.contrib import admin
 from django.contrib.auth.admin import UserAdmin as DjangoUserAdmin
-from django.contrib.auth.forms import ReadOnlyPasswordHashField
 from django.contrib.auth.models import Permission
 from django.utils.translation import ugettext_lazy as _
 
@@ -23,56 +21,10 @@ from . import models
 logger = logging.getLogger(__name__)
 
 
-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 Meta:
-        model = models.User
-        fields = ('email', 'birthdate')
-
-    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
-
-    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 = models.User
-        fields = ('email', 'password', 'birthdate', 'is_active', 'is_staff')
-
-    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 UserAdmin(DjangoUserAdmin):
     # The forms to add and change user instances
-    form = UserChangeForm
-    add_form = UserCreationForm
+    # form = UserChangeForm
+    # add_form = UserCreationForm
 
     # The fields to be used in displaying the User model.
     # These override the definitions on the base UserAdmin
@@ -84,19 +36,21 @@ class UserAdmin(DjangoUserAdmin):
         (None, {'fields': ('username', 'email', 'password')}),
         (_('Personal info'), {'fields': (
             'first_name', 'last_name', 'birthdate', 'gender', )}),
-        (_('Permissions'), {'fields': ('is_staff',)}),
+        (_('Permissions'), {'fields': ('is_staff', 'user_permissions')}),
+        (_('Information'), {'fields': ('date_joined', 'last_login', )})
     )
     # add_fieldsets is not a standard ModelAdmin attribute. UserAdmin
     # overrides get_fieldsets to use this attribute when creating a user.
     add_fieldsets = (
         (None, {
             'classes': ('wide',),
-            'fields': ('email', 'birthdate', 'password1', 'password2')
+            'fields': ('username', 'email', 'password1', 'password2')
         }),
     )
     search_fields = ('email',)
     ordering = ('email',)
-    filter_horizontal = ()
+    filter_horizontal = ('user_permissions', )
+    readonly_fields = ('date_joined', 'last_login', )
 
 # Now register the new UserAdmin...
 admin.site.register(models.User, UserAdmin)

shelfzilla/apps/account/models.py

@@ -40,10 +40,7 @@ class User(AbstractBaseUser,
         verbose_name=_('Username'),
         max_length=128,
         unique=True,
-        blank=True,
-        null=True,
         db_index=True,
-        default=None,
     )
 
     # personal info
@@ -93,7 +90,7 @@ class User(AbstractBaseUser,
     )
 
     USERNAME_FIELD = 'username'
-    REQUIRED_FIELDS = ('email', )
+    REQUIRED_FIELDS = ('email',)
 
     objects = UserManager()
 
@@ -101,7 +98,7 @@ class User(AbstractBaseUser,
         verbose_name = _('User')
 
     def __unicode__(self):
-        return self.username
+        return unicode(self.username) or unicode(self.email)
 
     @property
     def is_confirmed(self):