Changeset - 9e78e1ace313
[Not reviewed]
Merge
0 4 13
James Tauber - 12 years ago 2012-02-06 03:04:54
jtauber@jtauber.com
Merge branch 'fresh-start' into sponsorship

Conflicts:
symposion_project/settings.py
5 files changed with 50 insertions and 0 deletions:
0 comments (0 inline, 0 general)
.gitignore
Show inline comments
 
_build
 
*.pyc
 
dev.db
symposion_project/apps/conference/__init__.py
Show inline comments
 
new file 100644
symposion_project/apps/conference/admin.py
Show inline comments
 
new file 100644
 
from django.contrib import admin
 

	
 
from conference.models import Conference, Section
 

	
 

	
 
admin.site.register(Conference, list_display=("title", "start_date", "end_date"))
 
admin.site.register(Section, list_display=("name", "conference", "start_date", "end_date"))
symposion_project/apps/conference/models.py
Show inline comments
 
new file 100644
 
from django.db import models
 

	
 
from timezones.fields import TimeZoneField
 

	
 

	
 
class Conference(models.Model):
 
    """
 
    the full conference for a specific year, e.g. US PyCon 2012.
 
    """
 
    
 
    title = models.CharField(max_length=100)
 
    
 
    # when the conference runs
 
    start_date = models.DateField(null=True, blank=True)
 
    end_date = models.DateField(null=True, blank=True)
 
    
 
    # timezone the conference is in
 
    timezone = TimeZoneField(blank=True)
 
    
 
    def __unicode__(self):
 
        return self.title
 

	
 

	
 
class Section(models.Model):
 
    """
 
    a section of the conference such as "Tutorials", "Workshops",
 
    "Talks", "Expo", "Sprints", that may have its own review and
 
    scheduling process.
 
    """
 
    
 
    conference = models.ForeignKey(Conference)
 
    
 
    name = models.CharField(max_length=100)
 
    
 
    # when the section runs
 
    start_date = models.DateField(null=True, blank=True)
 
    end_date = models.DateField(null=True, blank=True)
 
    
 
    def __unicode__(self):
 
        return self.name
symposion_project/settings.py
Show inline comments
...
 
@@ -166,6 +166,7 @@ INSTALLED_APPS = [
 
    # project
 
    "about",
 
    "sponsorship",
 
    "conference",
 
]
 

	
 
FIXTURE_DIRS = [
0 comments (0 inline, 0 general)