projects
/
matthijs
/
projects
/
xerxes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Put some useful content in the character_changed template.
[matthijs/projects/xerxes.git]
/
events
/
models.py
diff --git
a/events/models.py
b/events/models.py
index 273ed7cc397b1219343db9796790e5411d620553..eccab097b48f194e43a41f68ee2dfc5bdda0466f 100644
(file)
--- a/
events/models.py
+++ b/
events/models.py
@@
-2,34
+2,34
@@
from django.db import models
# Create your models here.
class Event(models.Model):
# Create your models here.
class Event(models.Model):
-
name = models.CharField(max
length=50)
-
title = models.CharField(max
length=100)
-
slots = models.IntegerField()
+
name = models.CharField(max_
length=50)
+
title = models.CharField(max_
length=100)
+ slots = models.IntegerField()
-
def __str__(self):
-
if (self.title):
-
return self.name + ' - ' + self.title
-
else:
-
return self.name
+ def __str__(self):
+ if (self.title):
+ return self.name + ' - ' + self.title
+ else:
+ return self.name
-
class Admin:
-
fields = (
-
(None, {'fields' : ('name', 'title')} ),
-
('Registrations', {'fields' : ('slots',)} ),
-
)
+ class Admin:
+ fields = (
+ (None, {'fields' : ('name', 'title')} ),
+ ('Registrations', {'fields' : ('slots',)} ),
+ )
class Person(models.Model):
class Person(models.Model):
-
first_name = models.CharField(max
length=255)
-
last_name = models.CharField(max
length=255)
+
first_name = models.CharField(max_
length=255)
+
last_name = models.CharField(max_
length=255)
-
def __str__(self):
-
return self.first_name + ' ' + self.last_name
+ def __str__(self):
+ return self.first_name + ' ' + self.last_name
-
class Admin:
-
list_display = ('first_name', 'last_name')
-
list_filter = ['last_name']
-
search_fields = ['first_name', 'last_name']
+ class Admin:
+ list_display = ('first_name', 'last_name')
+ list_filter = ['last_name']
+ search_fields = ['first_name', 'last_name']
class Registration(models.Model):
class Registration(models.Model):
-
person = models.ForeignKey(Person, edit_inline=models.STACKED, num_in_admin=3)
-
event = models.ForeignKey(Event, core=True)
+ person = models.ForeignKey(Person, edit_inline=models.STACKED, num_in_admin=3)
+ event = models.ForeignKey(Event, core=True)