symposion_app Files · symposion/boxes/models.py

Files @ cb4b0fac3871

Branch filter:

Location: symposion_app/symposion/boxes/models.py

cb4b0fac3871 534 B text/x-python Show Annotation Show as Raw Download as Raw

Patrick Altman

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

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)