Improved admin view and User form

Author: DheerendraRathor

Diff for: account/admin.py

@@ -1,6 +1,11 @@
 from django.contrib import admin
+from django.contrib.auth.admin import UserAdmin
+from django.contrib.auth.models import User
+from django.utils.translation import ugettext_lazy as _
 from simple_history.admin import SimpleHistoryAdmin
 
+from user_resource.models import ContactNumber, InstituteAddress, Program, SecondaryEmail
+
 from .models import UserProfile
 
 
@@ -10,4 +15,38 @@ class UserProfileAdmin(SimpleHistoryAdmin):
     search_fields = ['user__username', 'user__first_name', 'roll_number']
 
 
+class InstituteAddressInline(admin.TabularInline):
+    model = InstituteAddress
+
+
+class UserProfileInline(admin.StackedInline):
+    model = UserProfile
+
+
+class ProgramInline(admin.StackedInline):
+    model = Program
+
+
+class ContactInline(admin.TabularInline):
+    model = ContactNumber
+
+
+class SecondaryEmailInline(admin.TabularInline):
+    model = SecondaryEmail
+
+
+class CustomUserAdmin(UserAdmin):
+    fieldsets = (
+        (None, {'fields': ('username', 'password')}),
+        (_('Personal info'), {'fields': ('first_name', 'last_name', 'email')}),
+        (_('Important dates'), {'fields': ('last_login', 'date_joined')}),
+    )
+
+    readonly_fields = ('username', 'first_name', 'last_name', 'email', 'last_login', 'date_joined')
+
+    inlines = [InstituteAddressInline, UserProfileInline, ProgramInline, ContactInline, SecondaryEmailInline]
+
+
+admin.site.unregister(User)
+admin.site.register(User, CustomUserAdmin)
 admin.site.register(UserProfile, UserProfileAdmin)

Diff for: application/forms.py

@@ -1,10 +1,14 @@
 from django import forms
 
+from core.utils import get_choices_with_blank_dash
+
 from .models import Application
 
 
 class RegistrationForm(forms.ModelForm):
     name = forms.CharField(max_length=255, widget=forms.TextInput(attrs={'class': 'form-control'}))
+    authorization_grant_type = forms.ChoiceField(choices=get_choices_with_blank_dash(Application.GRANT_TYPES[:2]),
+                                                 widget=forms.Select(attrs={'class': 'form-control'}))
 
     class Meta:
         model = Application
@@ -33,9 +37,6 @@ class Meta:
             'client_type': forms.Select(
                 attrs={'class': 'form-control', }
             ),
-            'authorization_grant_type': forms.Select(
-                attrs={'class': 'form-control', }
-            ),
             'redirect_uris': forms.Textarea(
                 attrs={'class': 'form-control', 'rows': 4, }
             )

Diff for: core/utils.py

@@ -1,6 +1,6 @@
 import collections
 
-import six
+import django.utils.six as six
 from django.conf import settings
 from django.core.urlresolvers import reverse
 from django.db.models import Model
@@ -34,14 +34,16 @@ def attr_to_dict(instance, key=None):
         return {key: instance}
 
 
+def get_choices_with_blank_dash(choices):
+    return BLANK_CHOICE_DASH + list(choices)
+
+
 SEXES = [
     ('male', 'Male'),
     ('female', 'Female'),
     ('other', 'Other'),
 ]
 
-BLANK_SEXES = BLANK_CHOICE_DASH + SEXES
-
 DISCIPLINES = [
     # Departments
     ['AE', 'Aerospace Engineering'],

Diff for: user_resource/forms.py

@@ -2,7 +2,7 @@
 from django.template.defaultfilters import filesizeformat
 from django.utils.translation import ugettext_lazy as _
 
-from core.utils import BLANK_SEXES
+from core.utils import SEXES, get_choices_with_blank_dash
 
 from .models import InstituteAddress, Program
 
@@ -23,7 +23,7 @@ def clean_profile_picture(self):
 
 
 class SexUpdateForm(forms.Form):
-    sex = forms.ChoiceField(choices=BLANK_SEXES, required=False,
+    sex = forms.ChoiceField(choices=get_choices_with_blank_dash(SEXES), required=False,
                             widget=forms.Select(
                                 attrs={'class': 'form-control', },
                             ))
@@ -78,4 +78,5 @@ class Meta:
         }
         labels = {
             'department': 'Discipline',
+            'graduation_year': '(Expected) Graduation Year',
         }

Diff for: user_resource/models.py

@@ -51,7 +51,7 @@ class Program(models.Model):
     _history_ = HistoricalRecords()
 
     def __str__(self):
-        return "%s, %s" % (self.degree, self.department)
+        return "%s, %s" % (self.get_degree_display(), self.get_department_display())
 
 
 @python_2_unicode_compatible