diff options
| -rw-r--r-- | development.cfg | 4 | ||||
| -rw-r--r-- | project/development.py | 2 | ||||
| -rw-r--r-- | project/kiwipycon/registration/migrations/0001_initial.py | 34 | ||||
| -rw-r--r-- | project/kiwipycon/registration/migrations/0002_create_wifi.py | 10 | ||||
| -rw-r--r-- | project/kiwipycon/registration/models.py | 2 | ||||
| -rw-r--r-- | project/kiwipycon/talk/forms.py | 2 |
6 files changed, 21 insertions, 33 deletions
diff --git a/development.cfg b/development.cfg index 87de778..f7807f9 100644 --- a/development.cfg +++ b/development.cfg @@ -2,8 +2,8 @@ extends = buildout.cfg -eggs += - pysqlite +#eggs += +# pysqlite [django] settings = development diff --git a/project/development.py b/project/development.py index f3c8847..0ec4671 100644 --- a/project/development.py +++ b/project/development.py @@ -31,7 +31,7 @@ INSTALLED_APPS = ( DATABASE_ENGINE = 'mysql' DATABASE_NAME = 'conference' -DATABASE_USER = '' +DATABASE_USER = 'root' DATABASE_PASSWORD = '' EMAIL_HOST = 'localhost' diff --git a/project/kiwipycon/registration/migrations/0001_initial.py b/project/kiwipycon/registration/migrations/0001_initial.py index 4154027..5393708 100644 --- a/project/kiwipycon/registration/migrations/0001_initial.py +++ b/project/kiwipycon/registration/migrations/0001_initial.py @@ -10,24 +10,20 @@ class Migration: # Adding model 'Registration' db.create_table('registration_registration', ( - ('city', models.CharField(max_length=255, blank=True)), ('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)), + ('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 @@ class Migration: }, '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'}) } diff --git a/project/kiwipycon/registration/migrations/0002_create_wifi.py b/project/kiwipycon/registration/migrations/0002_create_wifi.py index b5f7256..55e5a17 100644 --- a/project/kiwipycon/registration/migrations/0002_create_wifi.py +++ b/project/kiwipycon/registration/migrations/0002_create_wifi.py @@ -37,21 +37,17 @@ class Migration: }, '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'}) } diff --git a/project/kiwipycon/registration/models.py b/project/kiwipycon/registration/models.py index 17fdcca..4ef5356 100644 --- a/project/kiwipycon/registration/models.py +++ b/project/kiwipycon/registration/models.py @@ -46,7 +46,7 @@ class Registration(models.Model): # 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) diff --git a/project/kiwipycon/talk/forms.py b/project/kiwipycon/talk/forms.py index 5059285..db9064b 100644 --- a/project/kiwipycon/talk/forms.py +++ b/project/kiwipycon/talk/forms.py @@ -48,7 +48,7 @@ class TalkSubmitForm(forms.Form): 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)', |