Added initial migrates.
--- a/development.cfg Fri Oct 30 16:09:59 2009 +0530
+++ b/development.cfg Thu Nov 05 03:01:40 2009 +0530
@@ -2,8 +2,8 @@
extends =
buildout.cfg
-eggs +=
- pysqlite
+#eggs +=
+# pysqlite
[django]
settings = development
--- a/project/development.py Fri Oct 30 16:09:59 2009 +0530
+++ b/project/development.py Thu Nov 05 03:01:40 2009 +0530
@@ -31,7 +31,7 @@
DATABASE_ENGINE = 'mysql'
DATABASE_NAME = 'conference'
-DATABASE_USER = ''
+DATABASE_USER = 'root'
DATABASE_PASSWORD = ''
EMAIL_HOST = 'localhost'
--- a/project/kiwipycon/registration/migrations/0001_initial.py Fri Oct 30 16:09:59 2009 +0530
+++ b/project/kiwipycon/registration/migrations/0001_initial.py Thu Nov 05 03:01:40 2009 +0530
@@ -10,24 +10,20 @@
# Adding model 'Registration'
db.create_table('registration_registration', (
+ ('slug', models.SlugField()),
+ ('registrant', models.ForeignKey(orm['auth.User'])),
+ ('organisation', models.CharField(max_length=255, blank=True)),
+ ('occupation', models.CharField(max_length=255, blank=True)),
('city', models.CharField(max_length=255, blank=True)),
- ('slug', models.SlugField()),
+ ('postcode', models.CharField(max_length=255, blank=True)),
+ ('tshirt', models.CharField(max_length=2)),
+ ('conference', models.BooleanField(default=False)),
+ ('tutorial', models.BooleanField(default=False)),
+ ('sprint', models.BooleanField(default=False)),
('submitted', models.DateTimeField(auto_now_add=True)),
('allow_contact', models.BooleanField(default=False)),
('last_mod', models.DateTimeField(auto_now=True)),
- ('payment', models.BooleanField(default=False)),
- ('organisation', models.CharField(max_length=255, blank=True)),
- ('diet', models.CharField(max_length=255, blank=True)),
- ('id', models.AutoField(primary_key=True)),
- ('sponsor', models.CharField(max_length=255, blank=True)),
- ('discount', models.BooleanField(default=False)),
- ('amount', models.IntegerField(default=0)),
- ('tshirt', models.CharField(max_length=2)),
- ('beverage', models.CharField(max_length=255, blank=True)),
- ('postcode', models.CharField(max_length=255, blank=True)),
- ('party', models.BooleanField(default=False)),
- ('registrant', models.ForeignKey(orm['auth.User'])),
- ('occupation', models.CharField(max_length=255, blank=True)),
+ ('id', models.AutoField(primary_key=True)),
))
db.send_create_signal('registration', ['Registration'])
@@ -47,21 +43,17 @@
},
'registration.registration': {
'allow_contact': ('models.BooleanField', [], {'default': 'False'}),
- 'beverage': ('models.CharField', [], {'max_length': '255', 'blank': 'True'}),
'city': ('models.CharField', [], {'max_length': '255', 'blank': 'True'}),
- 'diet': ('models.CharField', [], {'max_length': '255', 'blank': 'True'}),
- 'discount': ('models.BooleanField', [], {'default': 'False'}),
- 'amount': ('models.IntegerField', [], {'default': 0}),
'id': ('models.AutoField', [], {'primary_key': 'True'}),
'last_mod': ('models.DateTimeField', [], {'auto_now': 'True'}),
'occupation': ('models.CharField', [], {'max_length': '255', 'blank': 'True'}),
'organisation': ('models.CharField', [], {'max_length': '255', 'blank': 'True'}),
- 'party': ('models.BooleanField', [], {'default': 'False'}),
- 'payment': ('models.BooleanField', [], {'default': 'False'}),
+ 'conference': ('models.BooleanField', [], {'default': 'False'}),
+ 'tutorial': ('models.BooleanField', [], {'default': 'False'}),
+ 'sprint': ('models.BooleanField', [], {'default': 'False'}),
'postcode': ('models.CharField', [], {'max_length': '255', 'blank': 'True'}),
'registrant': ('models.ForeignKey', ['User'], {}),
'slug': ('models.SlugField', [], {}),
- 'sponsor': ('models.CharField', [], {'max_length': '255', 'blank': 'True'}),
'submitted': ('models.DateTimeField', [], {'auto_now_add': 'True'}),
'tshirt': ('models.CharField', [], {'max_length': '2'})
}
--- a/project/kiwipycon/registration/migrations/0002_create_wifi.py Fri Oct 30 16:09:59 2009 +0530
+++ b/project/kiwipycon/registration/migrations/0002_create_wifi.py Thu Nov 05 03:01:40 2009 +0530
@@ -37,21 +37,17 @@
},
'registration.registration': {
'allow_contact': ('models.BooleanField', [], {'default': 'False'}),
- 'amount': ('models.IntegerField', [], {'default': '0'}),
- 'beverage': ('models.CharField', [], {'max_length': '255', 'blank': 'True'}),
'city': ('models.CharField', [], {'max_length': '255', 'blank': 'True'}),
- 'diet': ('models.CharField', [], {'max_length': '255', 'blank': 'True'}),
- 'discount': ('models.BooleanField', [], {'default': 'False'}),
'id': ('models.AutoField', [], {'primary_key': 'True'}),
'last_mod': ('models.DateTimeField', [], {'auto_now': 'True'}),
'occupation': ('models.CharField', [], {'max_length': '255', 'blank': 'True'}),
'organisation': ('models.CharField', [], {'max_length': '255', 'blank': 'True'}),
- 'party': ('models.BooleanField', [], {'default': 'False'}),
- 'payment': ('models.BooleanField', [], {'default': 'False'}),
+ 'conference': ('models.BooleanField', [], {'default': 'False'}),
+ 'tutorial': ('models.BooleanField', [], {'default': 'False'}),
+ 'sprint': ('models.BooleanField', [], {'default': 'False'}),
'postcode': ('models.CharField', [], {'max_length': '255', 'blank': 'True'}),
'registrant': ('models.ForeignKey', ['User'], {}),
'slug': ('models.SlugField', [], {}),
- 'sponsor': ('models.CharField', [], {'max_length': '255', 'blank': 'True'}),
'submitted': ('models.DateTimeField', [], {'auto_now_add': 'True'}),
'tshirt': ('models.CharField', [], {'max_length': '2'})
}
--- a/project/kiwipycon/registration/models.py Fri Oct 30 16:09:59 2009 +0530
+++ b/project/kiwipycon/registration/models.py Thu Nov 05 03:01:40 2009 +0530
@@ -46,7 +46,7 @@
# scipy.in specific
sprint = models.BooleanField(default=False)
- amount = models.IntegerField(default=0)
+# amount = models.IntegerField(default=0)
allow_contact = models.BooleanField(default=False)
# payment = models.BooleanField(default=False)
submitted = models.DateTimeField(auto_now_add=True)
--- a/project/kiwipycon/talk/forms.py Fri Oct 30 16:09:59 2009 +0530
+++ b/project/kiwipycon/talk/forms.py Thu Nov 05 03:01:40 2009 +0530
@@ -48,7 +48,7 @@
widget=forms.TextInput(attrs={'size':'50'}))
duration = forms.ChoiceField(choices=DURATION_CHOICES, required=True,
label=u'Preferred timeslot', help_text=u'Select preferred time slot')
- audience = forms.ChoiceField(choices=AUDIENCE_CHOICES, label=u'Itended audience',
+ audience = forms.ChoiceField(choices=AUDIENCE_CHOICES, label=u'Intended audience',
help_text=u'Select one of the available options or enter other type of intended audience')
# audience_other = forms.CharField(label=u'Other intended audience',
# help_text=u'Description of intended audience (ie. Discordians)',