Skip to content
This repository has been archived by the owner on Jan 8, 2019. It is now read-only.

Commit

Permalink
Merge pull request #26 from pmclanahan/720019-remove-events-section
Browse files Browse the repository at this point in the history
Remove events app and references.
  • Loading branch information
tofumatt committed Feb 29, 2012
2 parents 4130531 + f7c8ec6 commit b53479d
Show file tree
Hide file tree
Showing 11 changed files with 66 additions and 344 deletions.
15 changes: 0 additions & 15 deletions apps/events/admin.py

This file was deleted.

65 changes: 65 additions & 0 deletions apps/events/migrations/0004_auto__del_venue__del_event.py
@@ -0,0 +1,65 @@
# encoding: utf-8
import datetime
from south.db import db
from south.v2 import SchemaMigration
from django.db import models

class Migration(SchemaMigration):

def forwards(self, orm):

# Deleting model 'Venue'
db.delete_table('events_venue')

# Deleting model 'Event'
db.delete_table('events_event')

# Removing M2M table for field attendees on 'Event'
db.delete_table('events_event_attendees')


def backwards(self, orm):

# Adding model 'Venue'
db.create_table('events_venue', (
('address_two', self.gf('django.db.models.fields.CharField')(max_length=150, blank=True)),
('city', self.gf('django.db.models.fields.CharField')(max_length=100, blank=True)),
('state', self.gf('django.db.models.fields.CharField')(max_length=100, blank=True)),
('name', self.gf('django.db.models.fields.CharField')(max_length=100)),
('address', self.gf('django.db.models.fields.CharField')(max_length=150, blank=True)),
('country', self.gf('django.db.models.fields.CharField')(max_length=100, blank=True)),
('zip_code', self.gf('django.db.models.fields.CharField')(max_length=15, blank=True)),
('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
('slug', self.gf('django.db.models.fields.SlugField')(max_length=100, unique=True, db_index=True)),
))
db.send_create_signal('events', ['Venue'])

# Adding model 'Event'
db.create_table('events_event', (
('description', self.gf('django.db.models.fields.TextField')()),
('featured', self.gf('django.db.models.fields.BooleanField')(default=False)),
('featured_image', self.gf('django.db.models.fields.files.ImageField')(max_length=100, null=True, blank=True)),
('end', self.gf('django.db.models.fields.DateTimeField')()),
('slug', self.gf('django.db.models.fields.SlugField')(max_length=100, unique=True, db_index=True)),
('name', self.gf('django.db.models.fields.CharField')(max_length=100)),
('venue', self.gf('django.db.models.fields.related.ForeignKey')(default=None, to=orm['events.Venue'], null=True)),
('created_by', self.gf('django.db.models.fields.related.ForeignKey')(default=None, related_name='events', null=True, to=orm['users.Profile'])),
('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
('start', self.gf('django.db.models.fields.DateTimeField')()),
))
db.send_create_signal('events', ['Event'])

# Adding M2M table for field attendees on 'Event'
db.create_table('events_event_attendees', (
('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
('event', models.ForeignKey(orm['events.event'], null=False)),
('profile', models.ForeignKey(orm['users.profile'], null=False))
))
db.create_unique('events_event_attendees', ['event_id', 'profile_id'])


models = {

}

complete_apps = ['events']
68 changes: 0 additions & 68 deletions apps/events/models.py
@@ -1,68 +0,0 @@
from django.conf import settings
from django.db import models

from tower import ugettext_lazy as _

from innovate.models import BaseModel
from users.models import Profile


class Venue(BaseModel):
name = models.CharField(verbose_name=_(u'Name'), max_length=100)
slug = models.SlugField(verbose_name=_(u'URL Slug'), unique=True,
max_length=100)
address = models.CharField(verbose_name=_(u'Street Address 1'),
max_length=150, blank=True)
address_two = models.CharField(verbose_name=_(u'Street Address 2'),
max_length=150, blank=True)
city = models.CharField(verbose_name=_(u'City'), max_length=100,
blank=True)
state = models.CharField(verbose_name=_(u'State/Province'), max_length=100,
blank=True)
zip_code = models.CharField(verbose_name=_(u'Zip/Postal Code'),
max_length=15, blank=True)
country = models.CharField(verbose_name=_(u'Country'), max_length=100,
blank=True)

def __unicode__(self):
return self.name

@property
def full_address(self):
fields = (self.address, self.address_two, self.city, self.state,
self.country, self.zip_code)
populated = []
for field in fields:
if field:
populated.append(field)
return u', '.join(populated)


class Event(BaseModel):
name = models.CharField(verbose_name=_(u'Event Name'),
max_length=100)
slug = models.SlugField(verbose_name=_(u'Slug'), unique=True,
max_length=100)
start = models.DateTimeField(verbose_name=_(u'Start Date'))
end = models.DateTimeField(verbose_name=_(u'End Date'))
description = models.TextField(verbose_name=_(u'Description'))
attendees = models.ManyToManyField(Profile, verbose_name=_(u'Attendees'),
blank=True)
venue = models.ForeignKey(Venue, null=True, default=None)
featured = models.BooleanField(
verbose_name=_(u'Featured?'), default=False,
help_text=_(u'Display this event on the splash page'))
featured_image = models.ImageField(
verbose_name=_(u'Featured Image'),
blank=True, null=True, upload_to=settings.EVENT_IMAGE_PATH,
help_text=_(u'This image will appear on the splash page if this ' +
'is a featured project'))
created_by = models.ForeignKey('users.Profile', related_name='events',
null=True, default=None)

@property
def featured_image_or_default(self):
return self.featured_image or 'img/featured-default.gif'

def __unicode__(self):
return self.name
62 changes: 0 additions & 62 deletions apps/events/templates/events/all.html

This file was deleted.

107 changes: 0 additions & 107 deletions apps/events/templates/events/show.html

This file was deleted.

11 changes: 0 additions & 11 deletions apps/events/urls.py

This file was deleted.

50 changes: 0 additions & 50 deletions apps/events/views.py

This file was deleted.

0 comments on commit b53479d

Please sign in to comment.