Bootstrap templates
- event mockup - login page
This commit is contained in:
@@ -6,6 +6,7 @@ from django.utils.translation import ugettext as _
|
||||
|
||||
from musicians.models import Musician, PhoneNumber
|
||||
|
||||
from eventplanner.admin import EventParticipationInline
|
||||
|
||||
class PhoneNumberInline( admin.TabularInline ):
|
||||
model = PhoneNumber
|
||||
@@ -21,9 +22,20 @@ class MusicianInline( admin.StackedInline ):
|
||||
|
||||
# Define a new User admin
|
||||
class UserAdmin( UserAdmin ):
|
||||
inlines = (MusicianInline, PhoneNumberInline )
|
||||
inlines = (MusicianInline, PhoneNumberInline, )
|
||||
|
||||
|
||||
|
||||
class MusicianAdmin(admin.ModelAdmin):
|
||||
readonly_fields = ('user',)
|
||||
inlines = ( EventParticipationInline, )
|
||||
model = Musician
|
||||
|
||||
|
||||
# Re-register UserAdmin
|
||||
admin.site.unregister( User )
|
||||
admin.site.register(User, UserAdmin)
|
||||
|
||||
|
||||
admin.site.register( Musician, MusicianAdmin )
|
||||
|
||||
|
||||
@@ -41,4 +41,7 @@ class Musician( models.Model ):
|
||||
zip_code = models.IntegerField( null=True)
|
||||
|
||||
public_description = models.TextField( blank=True )
|
||||
|
||||
def __unicode__(self):
|
||||
return self.user.username
|
||||
|
||||
@@ -4,13 +4,11 @@ from django.views.generic import ListView
|
||||
from musicians.models import Musician
|
||||
from django import forms
|
||||
from django.http import HttpResponseRedirect
|
||||
from django.http import HttpResponse
|
||||
from django.shortcuts import render
|
||||
from django.shortcuts import get_object_or_404
|
||||
|
||||
from crispy_forms.helper import FormHelper
|
||||
from crispy_forms.layout import Submit
|
||||
from crispy_forms.layout import Layout, Fieldset, ButtonHolder, Submit
|
||||
|
||||
|
||||
class MusicianList( ListView):
|
||||
@@ -55,8 +53,6 @@ class UserEditForm(forms.ModelForm):
|
||||
# ),
|
||||
#)
|
||||
|
||||
|
||||
|
||||
self.fields.keyOrder.remove('first_name')
|
||||
self.fields.keyOrder.remove('last_name')
|
||||
self.fields.keyOrder.remove('email')
|
||||
|
||||
Reference in New Issue
Block a user