From 3d23957a8f87f8b9ddd10265ea8fc63ed09a718c Mon Sep 17 00:00:00 2001 From: Jailson Dias Date: Tue, 18 Oct 2016 17:31:48 -0300 Subject: [PATCH] removendo bug de migrações --- core/migrations/0001_initial.py | 14 +------------- core/migrations/0002_auto_20161018_1726.py | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ courses/migrations/0001_initial.py | 63 ++++++++------------------------------------------------------- courses/migrations/0002_auto_20161018_1726.py | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ exam/migrations/0001_initial.py | 6 +++--- files/migrations/0001_initial.py | 9 +++------ files/migrations/0002_topicfile_professor.py | 24 ++++++++++++++++++++++++ forum/migrations/0001_initial.py | 7 +------ forum/migrations/0002_auto_20161018_1726.py | 35 +++++++++++++++++++++++++++++++++++ links/migrations/0001_initial.py | 14 ++++++++------ poll/migrations/0001_initial.py | 20 ++++---------------- poll/migrations/0002_auto_20161018_1726.py | 30 ++++++++++++++++++++++++++++++ users/migrations/0001_initial.py | 4 ++-- 13 files changed, 274 insertions(+), 107 deletions(-) create mode 100644 core/migrations/0002_auto_20161018_1726.py create mode 100644 courses/migrations/0002_auto_20161018_1726.py create mode 100644 files/migrations/0002_topicfile_professor.py create mode 100644 forum/migrations/0002_auto_20161018_1726.py create mode 100644 poll/migrations/0002_auto_20161018_1726.py diff --git a/core/migrations/0001_initial.py b/core/migrations/0001_initial.py index 922c46e..85d9d2c 100644 --- a/core/migrations/0001_initial.py +++ b/core/migrations/0001_initial.py @@ -1,9 +1,8 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-18 02:46 +# Generated by Django 1.10 on 2016-10-18 20:26 from __future__ import unicode_literals import autoslug.fields -from django.conf import settings from django.db import migrations, models import django.db.models.deletion @@ -13,7 +12,6 @@ class Migration(migrations.Migration): initial = True dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] operations = [ @@ -33,7 +31,6 @@ class Migration(migrations.Migration): name='Action_Resource', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('action', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action', verbose_name='Action_Applied')), ], options={ 'verbose_name': 'Action_Resource', @@ -45,8 +42,6 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('datetime', models.DateTimeField(auto_now_add=True, verbose_name='Date and Time of action')), - ('action_resource', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action_Resource', verbose_name='Action_Resource')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Actor')), ], options={ 'verbose_name': 'Log', @@ -73,8 +68,6 @@ class Migration(migrations.Migration): ('read', models.BooleanField(default=False, verbose_name='Read')), ('datetime', models.DateTimeField(auto_now_add=True, verbose_name='Date and Time of action')), ('action_resource', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action_Resource', verbose_name='Action_Resource')), - ('actor', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='notification_Performer', to=settings.AUTH_USER_MODEL, verbose_name='Perfomer')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='notification_Actor', to=settings.AUTH_USER_MODEL, verbose_name='User')), ], options={ 'verbose_name': 'Notification', @@ -95,9 +88,4 @@ class Migration(migrations.Migration): 'verbose_name_plural': 'Resources', }, ), - migrations.AddField( - model_name='action_resource', - name='resource', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Resource', verbose_name='Resource'), - ), ] diff --git a/core/migrations/0002_auto_20161018_1726.py b/core/migrations/0002_auto_20161018_1726.py new file mode 100644 index 0000000..f97b0a5 --- /dev/null +++ b/core/migrations/0002_auto_20161018_1726.py @@ -0,0 +1,50 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-10-18 20:26 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('core', '0001_initial'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.AddField( + model_name='notification', + name='actor', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='notification_Performer', to=settings.AUTH_USER_MODEL, verbose_name='Perfomer'), + ), + migrations.AddField( + model_name='notification', + name='user', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='notification_Actor', to=settings.AUTH_USER_MODEL, verbose_name='User'), + ), + migrations.AddField( + model_name='log', + name='action_resource', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action_Resource', verbose_name='Action_Resource'), + ), + migrations.AddField( + model_name='log', + name='user', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Actor'), + ), + migrations.AddField( + model_name='action_resource', + name='action', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action', verbose_name='Action_Applied'), + ), + migrations.AddField( + model_name='action_resource', + name='resource', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Resource', verbose_name='Resource'), + ), + ] diff --git a/courses/migrations/0001_initial.py b/courses/migrations/0001_initial.py index 54dc716..8568e74 100644 --- a/courses/migrations/0001_initial.py +++ b/courses/migrations/0001_initial.py @@ -1,9 +1,8 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-18 02:46 +# Generated by Django 1.10 on 2016-10-18 20:26 from __future__ import unicode_literals import autoslug.fields -from django.conf import settings from django.db import migrations, models import django.db.models.deletion import s3direct.fields @@ -15,7 +14,6 @@ class Migration(migrations.Migration): dependencies = [ ('core', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] operations = [ @@ -25,7 +23,6 @@ class Migration(migrations.Migration): ('resource_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='core.Resource')), ('limit_date', models.DateField(verbose_name='Deliver Date')), ('all_students', models.BooleanField(default=False, verbose_name='All Students')), - ('students', models.ManyToManyField(related_name='activities', to=settings.AUTH_USER_MODEL, verbose_name='Students')), ], bases=('core.resource',), ), @@ -35,11 +32,10 @@ class Migration(migrations.Migration): ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('pdf', s3direct.fields.S3DirectField()), ('name', models.CharField(max_length=100)), - ('diet', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='files', to='courses.Activity')), ], options={ - 'verbose_name_plural': 'Activitys Files', 'verbose_name': 'Activity File', + 'verbose_name_plural': 'Activitys Files', }, ), migrations.CreateModel( @@ -51,8 +47,8 @@ class Migration(migrations.Migration): ('create_date', models.DateField(auto_now_add=True, verbose_name='Creation Date')), ], options={ - 'verbose_name_plural': 'Categories', 'verbose_name': 'Category', + 'verbose_name_plural': 'Categories', }, ), migrations.CreateModel( @@ -72,9 +68,9 @@ class Migration(migrations.Migration): ('image', models.ImageField(blank=True, upload_to='courses/', verbose_name='Image')), ], options={ + 'verbose_name': 'Course', 'verbose_name_plural': 'Courses', 'ordering': ('create_date', 'name'), - 'verbose_name': 'Course', }, ), migrations.CreateModel( @@ -86,8 +82,8 @@ class Migration(migrations.Migration): ('create_date', models.DateField(auto_now_add=True, verbose_name='Creation Date')), ], options={ - 'verbose_name_plural': 'Categories', 'verbose_name': 'Category', + 'verbose_name_plural': 'Categories', }, ), migrations.CreateModel( @@ -112,7 +108,6 @@ class Migration(migrations.Migration): fields=[ ('resource_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='core.Resource')), ('all_students', models.BooleanField(default=False, verbose_name='All Students')), - ('students', models.ManyToManyField(related_name='materials', to=settings.AUTH_USER_MODEL, verbose_name='Students')), ], bases=('core.resource',), ), @@ -128,15 +123,11 @@ class Migration(migrations.Migration): ('end_date', models.DateField(verbose_name='End of Subject Date')), ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')), ('update_date', models.DateTimeField(auto_now=True, verbose_name='Date of last update')), - ('category', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='subject_category', to='courses.CategorySubject', verbose_name='Category')), - ('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='subjects', to='courses.Course', verbose_name='Course')), - ('professors', models.ManyToManyField(related_name='professors_subjects', to=settings.AUTH_USER_MODEL, verbose_name='Professors')), - ('students', models.ManyToManyField(related_name='subject_student', to=settings.AUTH_USER_MODEL, verbose_name='Students')), ], options={ + 'verbose_name': 'Subject', 'verbose_name_plural': 'Subjects', 'ordering': ('create_date', 'name'), - 'verbose_name': 'Subject', }, ), migrations.CreateModel( @@ -146,11 +137,10 @@ class Migration(migrations.Migration): ('name', models.CharField(max_length=100, verbose_name='Name')), ('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='name', unique=True, verbose_name='Slug')), ('description', models.TextField(blank=True, verbose_name='Description')), - ('subjects', models.ManyToManyField(to='courses.Subject')), ], options={ - 'verbose_name_plural': 'subject categories', 'verbose_name': 'subject category', + 'verbose_name_plural': 'subject categories', }, ), migrations.CreateModel( @@ -163,48 +153,11 @@ class Migration(migrations.Migration): ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')), ('update_date', models.DateTimeField(auto_now=True, verbose_name='Date of last update')), ('visible', models.BooleanField(default=False, verbose_name='Visible')), - ('owner', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Owner')), - ('subject', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Subject', verbose_name='Subject')), ], options={ + 'verbose_name': 'Topic', 'verbose_name_plural': 'Topics', 'ordering': ('create_date', 'name'), - 'verbose_name': 'Topic', }, ), - migrations.AddField( - model_name='material', - name='topic', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='materials', to='courses.Topic', verbose_name='Topic'), - ), - migrations.AddField( - model_name='linkmaterial', - name='material', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='material_link', to='courses.Material', verbose_name='Material'), - ), - migrations.AddField( - model_name='filematerial', - name='material', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='material_file', to='courses.Material', verbose_name='Material'), - ), - migrations.AddField( - model_name='course', - name='category', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='course_category', to='courses.CourseCategory', verbose_name='Category'), - ), - migrations.AddField( - model_name='course', - name='professors', - field=models.ManyToManyField(related_name='courses_professors', to=settings.AUTH_USER_MODEL, verbose_name='Professors'), - ), - migrations.AddField( - model_name='course', - name='students', - field=models.ManyToManyField(related_name='courses_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'), - ), - migrations.AddField( - model_name='activity', - name='topic', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='activities', to='courses.Topic', verbose_name='Topic'), - ), ] diff --git a/courses/migrations/0002_auto_20161018_1726.py b/courses/migrations/0002_auto_20161018_1726.py new file mode 100644 index 0000000..aa1910c --- /dev/null +++ b/courses/migrations/0002_auto_20161018_1726.py @@ -0,0 +1,105 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-10-18 20:26 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('courses', '0001_initial'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.AddField( + model_name='topic', + name='owner', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Owner'), + ), + migrations.AddField( + model_name='topic', + name='subject', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Subject', verbose_name='Subject'), + ), + migrations.AddField( + model_name='subjectcategory', + name='subjects', + field=models.ManyToManyField(to='courses.Subject'), + ), + migrations.AddField( + model_name='subject', + name='category', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='subject_category', to='courses.CategorySubject', verbose_name='Category'), + ), + migrations.AddField( + model_name='subject', + name='course', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='subjects', to='courses.Course', verbose_name='Course'), + ), + migrations.AddField( + model_name='subject', + name='professors', + field=models.ManyToManyField(related_name='professors_subjects', to=settings.AUTH_USER_MODEL, verbose_name='Professors'), + ), + migrations.AddField( + model_name='subject', + name='students', + field=models.ManyToManyField(related_name='subject_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'), + ), + migrations.AddField( + model_name='material', + name='students', + field=models.ManyToManyField(related_name='materials', to=settings.AUTH_USER_MODEL, verbose_name='Students'), + ), + migrations.AddField( + model_name='material', + name='topic', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='materials', to='courses.Topic', verbose_name='Topic'), + ), + migrations.AddField( + model_name='linkmaterial', + name='material', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='material_link', to='courses.Material', verbose_name='Material'), + ), + migrations.AddField( + model_name='filematerial', + name='material', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='material_file', to='courses.Material', verbose_name='Material'), + ), + migrations.AddField( + model_name='course', + name='category', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='course_category', to='courses.CourseCategory', verbose_name='Category'), + ), + migrations.AddField( + model_name='course', + name='professors', + field=models.ManyToManyField(related_name='courses_professors', to=settings.AUTH_USER_MODEL, verbose_name='Professors'), + ), + migrations.AddField( + model_name='course', + name='students', + field=models.ManyToManyField(related_name='courses_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'), + ), + migrations.AddField( + model_name='activityfile', + name='diet', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='files', to='courses.Activity'), + ), + migrations.AddField( + model_name='activity', + name='students', + field=models.ManyToManyField(related_name='activities', to=settings.AUTH_USER_MODEL, verbose_name='Students'), + ), + migrations.AddField( + model_name='activity', + name='topic', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='activities', to='courses.Topic', verbose_name='Topic'), + ), + ] diff --git a/exam/migrations/0001_initial.py b/exam/migrations/0001_initial.py index 1cafa15..e675ce6 100644 --- a/exam/migrations/0001_initial.py +++ b/exam/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-18 02:47 +# Generated by Django 1.10 on 2016-10-18 20:26 from __future__ import unicode_literals from django.db import migrations, models @@ -23,8 +23,8 @@ class Migration(migrations.Migration): ('order', models.PositiveSmallIntegerField(verbose_name='Order')), ], options={ - 'verbose_name_plural': 'Answers', 'verbose_name': 'Answer', + 'verbose_name_plural': 'Answers', 'ordering': ('order',), }, ), @@ -35,8 +35,8 @@ class Migration(migrations.Migration): ('begin_date', models.DateField(blank=True, verbose_name='Begin of Course Date')), ], options={ - 'verbose_name_plural': 'Exams', 'verbose_name': 'Exam', + 'verbose_name_plural': 'Exams', }, bases=('courses.activity',), ), diff --git a/files/migrations/0001_initial.py b/files/migrations/0001_initial.py index 30e542d..5a010ff 100644 --- a/files/migrations/0001_initial.py +++ b/files/migrations/0001_initial.py @@ -1,8 +1,7 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-18 02:47 +# Generated by Django 1.10 on 2016-10-18 20:26 from __future__ import unicode_literals -from django.conf import settings from django.db import migrations, models import django.db.models.deletion import files.models @@ -13,9 +12,8 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('courses', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), ('core', '0001_initial'), + ('courses', '0001_initial'), ] operations = [ @@ -26,11 +24,10 @@ class Migration(migrations.Migration): ('description', models.TextField(blank=True, verbose_name='Description')), ('file_url', models.FileField(upload_to=files.models.file_path, verbose_name='File')), ('file_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='topic_files', to='core.MimeType', verbose_name='Type file')), - ('professor', models.ManyToManyField(related_name='file_professors', to=settings.AUTH_USER_MODEL, verbose_name='Professors')), ], options={ - 'verbose_name_plural': 'Files', 'verbose_name': 'File', + 'verbose_name_plural': 'Files', 'ordering': ('-id',), }, bases=('courses.material',), diff --git a/files/migrations/0002_topicfile_professor.py b/files/migrations/0002_topicfile_professor.py new file mode 100644 index 0000000..306032d --- /dev/null +++ b/files/migrations/0002_topicfile_professor.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-10-18 20:26 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('files', '0001_initial'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.AddField( + model_name='topicfile', + name='professor', + field=models.ManyToManyField(related_name='file_professors', to=settings.AUTH_USER_MODEL, verbose_name='Professors'), + ), + ] diff --git a/forum/migrations/0001_initial.py b/forum/migrations/0001_initial.py index e44043d..37781cc 100644 --- a/forum/migrations/0001_initial.py +++ b/forum/migrations/0001_initial.py @@ -1,8 +1,7 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-18 02:48 +# Generated by Django 1.10 on 2016-10-18 20:26 from __future__ import unicode_literals -from django.conf import settings from django.db import migrations, models import django.db.models.deletion @@ -12,7 +11,6 @@ class Migration(migrations.Migration): initial = True dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), ('courses', '0001_initial'), ] @@ -38,8 +36,6 @@ class Migration(migrations.Migration): ('message', models.TextField(verbose_name='Post message')), ('modification_date', models.DateTimeField(auto_now=True, verbose_name='Modification Date')), ('post_date', models.DateTimeField(auto_now_add=True, verbose_name='Post Date')), - ('forum', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='forum.Forum', verbose_name='Forum')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Autor')), ], options={ 'verbose_name': 'Post', @@ -54,7 +50,6 @@ class Migration(migrations.Migration): ('modification_date', models.DateTimeField(auto_now=True, verbose_name='Modification Date')), ('answer_date', models.DateTimeField(auto_now_add=True, verbose_name='Answer Date')), ('post', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='forum.Post', verbose_name='Post')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Autor')), ], options={ 'verbose_name': 'Post Answer', diff --git a/forum/migrations/0002_auto_20161018_1726.py b/forum/migrations/0002_auto_20161018_1726.py new file mode 100644 index 0000000..c6696f9 --- /dev/null +++ b/forum/migrations/0002_auto_20161018_1726.py @@ -0,0 +1,35 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-10-18 20:26 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('forum', '0001_initial'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.AddField( + model_name='postanswer', + name='user', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Autor'), + ), + migrations.AddField( + model_name='post', + name='forum', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='forum.Forum', verbose_name='Forum'), + ), + migrations.AddField( + model_name='post', + name='user', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Autor'), + ), + ] diff --git a/links/migrations/0001_initial.py b/links/migrations/0001_initial.py index bce2a6c..0ebdf4a 100644 --- a/links/migrations/0001_initial.py +++ b/links/migrations/0001_initial.py @@ -1,8 +1,9 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-18 02:47 +# Generated by Django 1.10 on 2016-10-18 20:26 from __future__ import unicode_literals from django.db import migrations, models +import django.db.models.deletion class Migration(migrations.Migration): @@ -10,20 +11,21 @@ class Migration(migrations.Migration): initial = True dependencies = [ + ('courses', '0001_initial'), ] operations = [ migrations.CreateModel( name='Link', fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('link', models.URLField()), - ('description', models.CharField(max_length=200)), + ('material_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='courses.Material')), + ('link_url', models.URLField()), + ('link_description', models.CharField(max_length=200)), ], options={ - 'verbose_name_plural': 'Links', 'verbose_name': 'Link', + 'verbose_name_plural': 'Links', }, + bases=('courses.material',), ), ] diff --git a/poll/migrations/0001_initial.py b/poll/migrations/0001_initial.py index 404b9fd..f98088f 100644 --- a/poll/migrations/0001_initial.py +++ b/poll/migrations/0001_initial.py @@ -1,8 +1,7 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-18 02:47 +# Generated by Django 1.10 on 2016-10-18 20:26 from __future__ import unicode_literals -from django.conf import settings from django.db import migrations, models import django.db.models.deletion @@ -13,7 +12,6 @@ class Migration(migrations.Migration): dependencies = [ ('courses', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] operations = [ @@ -25,8 +23,8 @@ class Migration(migrations.Migration): ('order', models.PositiveSmallIntegerField(verbose_name='Order')), ], options={ - 'verbose_name_plural': 'Answers', 'verbose_name': 'Answer', + 'verbose_name_plural': 'Answers', 'ordering': ('order',), }, ), @@ -39,8 +37,8 @@ class Migration(migrations.Migration): ('answer', models.ManyToManyField(related_name='answers_stundet', to='poll.Answer', verbose_name='Answers Students')), ], options={ - 'verbose_name_plural': 'Answers Student', 'verbose_name': 'Answer Stundent', + 'verbose_name_plural': 'Answers Student', }, ), migrations.CreateModel( @@ -49,8 +47,8 @@ class Migration(migrations.Migration): ('activity_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='courses.Activity')), ], options={ - 'verbose_name_plural': 'Polls', 'verbose_name': 'Poll', + 'verbose_name_plural': 'Polls', }, bases=('courses.activity',), ), @@ -59,14 +57,4 @@ class Migration(migrations.Migration): name='poll', field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers_stundet', to='poll.Poll', verbose_name='Poll'), ), - migrations.AddField( - model_name='answersstudent', - name='student', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers_stundent', to=settings.AUTH_USER_MODEL, verbose_name='Student'), - ), - migrations.AddField( - model_name='answer', - name='poll', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers', to='poll.Poll', verbose_name='Answers'), - ), ] diff --git a/poll/migrations/0002_auto_20161018_1726.py b/poll/migrations/0002_auto_20161018_1726.py new file mode 100644 index 0000000..d7a6a92 --- /dev/null +++ b/poll/migrations/0002_auto_20161018_1726.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-10-18 20:26 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('poll', '0001_initial'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.AddField( + model_name='answersstudent', + name='student', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers_stundent', to=settings.AUTH_USER_MODEL, verbose_name='Student'), + ), + migrations.AddField( + model_name='answer', + name='poll', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers', to='poll.Poll', verbose_name='Answers'), + ), + ] diff --git a/users/migrations/0001_initial.py b/users/migrations/0001_initial.py index 82b169d..3752fc0 100644 --- a/users/migrations/0001_initial.py +++ b/users/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-17 15:49 +# Generated by Django 1.10 on 2016-10-18 20:26 from __future__ import unicode_literals import django.contrib.auth.models @@ -42,8 +42,8 @@ class Migration(migrations.Migration): ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions')), ], options={ - 'verbose_name_plural': 'Users', 'verbose_name': 'User', + 'verbose_name_plural': 'Users', }, managers=[ ('objects', django.contrib.auth.models.UserManager()), -- libgit2 0.21.2