# HG changeset patch # User Madhusudan.C.S # Date 1257371646 -19800 # Node ID e0b9c2f8c43341d3a7a90abe3155ea0e22bf9d63 # Parent bffb109e23c1074ec1b1b309192f46ea2c8674ac# Parent f6851340fc739ff3be6219b3a89cfa0dd125870f Merged Mainline and Madhu branches. diff -r f6851340fc73 -r e0b9c2f8c433 project/development.py --- a/project/development.py Wed Nov 04 16:51:32 2009 -0500 +++ b/project/development.py Thu Nov 05 03:24:06 2009 +0530 @@ -31,7 +31,7 @@ DATABASE_ENGINE = 'mysql' DATABASE_NAME = 'conference' -DATABASE_USER = '' +DATABASE_USER = 'root' DATABASE_PASSWORD = '' EMAIL_HOST = 'localhost' diff -r f6851340fc73 -r e0b9c2f8c433 project/kiwipycon/registration/migrations/0001_initial.py --- a/project/kiwipycon/registration/migrations/0001_initial.py Wed Nov 04 16:51:32 2009 -0500 +++ b/project/kiwipycon/registration/migrations/0001_initial.py Thu Nov 05 03:24:06 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'}) } diff -r f6851340fc73 -r e0b9c2f8c433 project/kiwipycon/registration/migrations/0002_create_wifi.py --- a/project/kiwipycon/registration/migrations/0002_create_wifi.py Wed Nov 04 16:51:32 2009 -0500 +++ b/project/kiwipycon/registration/migrations/0002_create_wifi.py Thu Nov 05 03:24:06 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'}) } diff -r f6851340fc73 -r e0b9c2f8c433 project/kiwipycon/registration/models.py --- a/project/kiwipycon/registration/models.py Wed Nov 04 16:51:32 2009 -0500 +++ b/project/kiwipycon/registration/models.py Thu Nov 05 03:24:06 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) diff -r f6851340fc73 -r e0b9c2f8c433 project/kiwipycon/talk/forms.py --- a/project/kiwipycon/talk/forms.py Wed Nov 04 16:51:32 2009 -0500 +++ b/project/kiwipycon/talk/forms.py Thu Nov 05 03:24:06 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)', diff -r f6851340fc73 -r e0b9c2f8c433 project/kiwipycon/talk/migrations/0001_initial.py --- a/project/kiwipycon/talk/migrations/0001_initial.py Wed Nov 04 16:51:32 2009 -0500 +++ b/project/kiwipycon/talk/migrations/0001_initial.py Thu Nov 05 03:24:06 2009 +0530 @@ -17,16 +17,16 @@ ('contact', models.CharField(max_length=1024)), ('title', models.CharField(max_length=1024)), ('abstract', models.TextField()), - ('outline', models.TextField()), +# ('outline', models.TextField()), ('topic', models.CharField(blank=True, max_length=255)), - ('topic_other', models.CharField(max_length=255, blank=True)), +# ('topic_other', models.CharField(max_length=255, blank=True)), ('duration', models.CharField(max_length=3)), ('audience', models.CharField(blank=True, max_length=32)), - ('audience_other', models.CharField(max_length=128, blank=True)), +# ('audience_other', models.CharField(max_length=128, blank=True)), ('approved', models.BooleanField(default=False)), ('submitted', models.DateTimeField(auto_now_add=True)), ('last_mod', models.DateTimeField(auto_now=True)), - ('tags', TagField(blank=True)), +# ('tags', TagField(blank=True)), )) db.send_create_signal('talk', ['Talk']) diff -r f6851340fc73 -r e0b9c2f8c433 project/kiwipycon/talk/models.py --- a/project/kiwipycon/talk/models.py Wed Nov 04 16:51:32 2009 -0500 +++ b/project/kiwipycon/talk/models.py Thu Nov 05 03:24:06 2009 +0530 @@ -54,7 +54,7 @@ topic = models.CharField(max_length=255, #choices=TOPIC_CHOICES, blank=True) - #topic_other = models.CharField(max_length=255, blank=True) +# topic_other = models.CharField(max_length=255, blank=True) duration = models.CharField(max_length=3, choices=DURATION_CHOICES) audience = models.CharField(max_length=32, choices=AUDIENCE_CHOICES, blank=True) # audience_other = models.CharField(max_length=128, blank=True) diff -r f6851340fc73 -r e0b9c2f8c433 project/kiwipycon/talk/views.py --- a/project/kiwipycon/talk/views.py Wed Nov 04 16:51:32 2009 -0500 +++ b/project/kiwipycon/talk/views.py Thu Nov 05 03:24:06 2009 +0530 @@ -150,14 +150,15 @@ contact = talk_form.data.get('contact'), title = talk_form.data.get('title'), abstract = talk_form.data.get('abstract'), - outline = talk_form.data.get('outline'), +# outline = talk_form.data.get('outline'), topic = talk_form.data.get('topic'), - topic_other = talk_form.data.get('topic_other'), +# topic_other = talk_form.data.get('topic_other'), duration = talk_form.data.get('duration'), audience = talk_form.data.get('audience'), - audience_other = talk_form.data.get('audience_other'), +# audience_other = talk_form.data.get('audience_other'), approved = False, - tags = talk_form.data.get('tags')) +# tags = talk_form.data.get('tags') + ) talk.save() # Saved, ... redirect back to account redirect_to = reverse('kiwipycon_account')