Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
FedeG
committed
Apr 5, 2016
1 parent
2713eac
commit c23c5e7
Showing
12 changed files
with
317 additions
and
47 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
# -*- coding: utf-8 -*- | ||
from __future__ import unicode_literals | ||
|
||
from django.db import models, migrations | ||
import manager.models | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('manager', '0001_initial'), | ||
] | ||
|
||
operations = [ | ||
migrations.AlterField( | ||
model_name='event', | ||
name='slug', | ||
field=models.CharField(help_text='For example: flisol-caba', unique=True, max_length=200, verbose_name='URL', validators=[manager.models.validate_url]), | ||
preserve_default=True, | ||
), | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
# -*- coding: utf-8 -*- | ||
from __future__ import unicode_literals | ||
|
||
from django.db import models, migrations | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('manager', '0002_auto_20160320_0309'), | ||
] | ||
|
||
operations = [ | ||
migrations.AlterField( | ||
model_name='contact', | ||
name='event', | ||
field=models.ForeignKey(related_name='contacts', verbose_name=b'Event', blank=True, to='manager.Event'), | ||
preserve_default=True, | ||
), | ||
migrations.AlterField( | ||
model_name='contact', | ||
name='text', | ||
field=models.CharField(help_text='i.e. @Flisol', max_length=200, verbose_name='Text'), | ||
preserve_default=True, | ||
), | ||
migrations.AlterField( | ||
model_name='contact', | ||
name='url', | ||
field=models.URLField(help_text='i.e. https://twitter.com/flisol', verbose_name=b'URL'), | ||
preserve_default=True, | ||
), | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
# -*- coding: utf-8 -*- | ||
from __future__ import unicode_literals | ||
|
||
from django.db import models, migrations | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('manager', '0003_auto_20160323_1504'), | ||
] | ||
|
||
operations = [ | ||
migrations.AlterField( | ||
model_name='contact', | ||
name='event', | ||
field=models.ForeignKey(related_name='contacts', verbose_name=b'Event', blank=True, to='manager.Event', null=True), | ||
preserve_default=True, | ||
), | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
# -*- coding: utf-8 -*- | ||
from __future__ import unicode_literals | ||
|
||
from django.db import models, migrations | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('manager', '0004_auto_20160324_1856'), | ||
] | ||
|
||
operations = [ | ||
migrations.CreateModel( | ||
name='NonRegisteredAttendee', | ||
fields=[ | ||
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), | ||
('first_name', models.CharField(max_length=30, verbose_name='First Name', blank=True)), | ||
('last_name', models.CharField(max_length=30, verbose_name='Last Name', blank=True)), | ||
('email', models.EmailField(max_length=75, verbose_name='E-mail Address', blank=True)), | ||
('assisted', models.BooleanField(default=True, verbose_name='Assisted')), | ||
('is_installing', models.BooleanField(default=False, help_text='Will you bring a PC for installation?', verbose_name='Is Installing')), | ||
('installation_additional_info', models.TextField(help_text='i.e. Wath kind of PC are you bringing?', null=True, verbose_name='Additional Info', blank=True)), | ||
], | ||
options={ | ||
'verbose_name': 'Non Registered Attendee', | ||
'verbose_name_plural': 'Non Registered Attendees', | ||
}, | ||
bases=(models.Model,), | ||
), | ||
migrations.AddField( | ||
model_name='eventuser', | ||
name='nonregisteredattendee', | ||
field=models.ForeignKey(verbose_name='Non Registered Attendee', blank=True, to='manager.NonRegisteredAttendee', null=True), | ||
preserve_default=True, | ||
), | ||
migrations.AlterUniqueTogether( | ||
name='eventuser', | ||
unique_together=set([('event', 'user')]), | ||
), | ||
] |
18 changes: 18 additions & 0 deletions
18
manager/migrations/0006_remove_nonregisteredattendee_assisted.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
# -*- coding: utf-8 -*- | ||
from __future__ import unicode_literals | ||
|
||
from django.db import models, migrations | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('manager', '0005_auto_20160329_0554'), | ||
] | ||
|
||
operations = [ | ||
migrations.RemoveField( | ||
model_name='nonregisteredattendee', | ||
name='assisted', | ||
), | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
# -*- coding: utf-8 -*- | ||
from __future__ import unicode_literals | ||
|
||
from django.db import models, migrations | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('manager', '0006_remove_nonregisteredattendee_assisted'), | ||
] | ||
|
||
operations = [ | ||
migrations.RemoveField( | ||
model_name='hardware', | ||
name='serial', | ||
), | ||
migrations.RemoveField( | ||
model_name='software', | ||
name='version', | ||
), | ||
migrations.AlterField( | ||
model_name='hardware', | ||
name='manufacturer', | ||
field=models.CharField(max_length=200, null=True, verbose_name='Manufacturer', blank=True), | ||
preserve_default=True, | ||
), | ||
migrations.DeleteModel( | ||
name='HardwareManufacturer', | ||
), | ||
migrations.AlterField( | ||
model_name='installation', | ||
name='attendee', | ||
field=models.ForeignKey(verbose_name='Attendee', to='manager.EventUser', help_text='The owner of the installed hardware'), | ||
preserve_default=True, | ||
), | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
# -*- coding: utf-8 -*- | ||
from __future__ import unicode_literals | ||
|
||
from django.db import models, migrations | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('manager', '0007_auto_20160331_1432'), | ||
] | ||
|
||
operations = [ | ||
migrations.AlterField( | ||
model_name='installation', | ||
name='installer', | ||
field=models.ForeignKey(related_name='installed_by', verbose_name='Installer', blank=True, to='manager.EventUser', null=True), | ||
preserve_default=True, | ||
), | ||
] |
Oops, something went wrong.