Files
@ cb4b0fac3871
Branch filter:
Location: symposion_app/symposion/boxes/models.py - annotation
cb4b0fac3871
534 B
text/x-python
Merge branch 'django1.6-compatibility' of https://github.com/mbrochh/symposion into mbrochh-django1.6-compatibility
Conflicts:
symposion/boxes/urls.py
symposion/cms/urls.py
symposion/conference/urls.py
symposion/proposals/models.py
symposion/proposals/urls.py
symposion/reviews/urls.py
symposion/schedule/models.py
symposion/schedule/urls.py
symposion/speakers/urls.py
symposion/sponsorship/urls.py
symposion/teams/urls.py
Conflicts:
symposion/boxes/urls.py
symposion/cms/urls.py
symposion/conference/urls.py
symposion/proposals/models.py
symposion/proposals/urls.py
symposion/reviews/urls.py
symposion/schedule/models.py
symposion/schedule/urls.py
symposion/speakers/urls.py
symposion/sponsorship/urls.py
symposion/teams/urls.py
2665fd575869 2665fd575869 2665fd575869 2665fd575869 6cf7a62da1cb 6cf7a62da1cb 2665fd575869 2665fd575869 2665fd575869 2665fd575869 36ab6d599ffc 2665fd575869 2665fd575869 36ab6d599ffc 2665fd575869 2665fd575869 36ab6d599ffc 2665fd575869 2665fd575869 36ab6d599ffc 2665fd575869 2665fd575869 6cf7a62da1cb 6cf7a62da1cb 6cf7a62da1cb | from django.db import models
from django.contrib.auth.models import User
import reversion
from markitup.fields import MarkupField
class Box(models.Model):
label = models.CharField(max_length=100, db_index=True)
content = MarkupField(blank=True)
created_by = models.ForeignKey(User, related_name="boxes")
last_updated_by = models.ForeignKey(User, related_name="updated_boxes")
def __unicode__(self):
return self.label
class Meta:
verbose_name_plural = "boxes"
reversion.register(Box)
|