From df6354076a20e3417875550945a5764687d0f814 Mon Sep 17 00:00:00 2001 From: Matheus Lins Date: Tue, 4 Oct 2016 23:06:00 -0300 Subject: [PATCH] fixing bug migrations --- core/migrations/0001_initial.py | 14 +++++++++++++- core/migrations/0002_auto_20161003_1610.py | 50 -------------------------------------------------- courses/migrations/0001_initial.py | 25 ++++++++++++++++++++++++- courses/migrations/0002_auto_20161003_1610.py | 85 ------------------------------------------------------------------------------------- courses/migrations/0003_activityfile.py | 30 ------------------------------ forum/migrations/0001_initial.py | 7 ++++++- forum/migrations/0002_auto_20161003_1610.py | 35 ----------------------------------- poll/migrations/0001_initial.py | 2 +- 8 files changed, 44 insertions(+), 204 deletions(-) delete mode 100644 core/migrations/0002_auto_20161003_1610.py delete mode 100644 courses/migrations/0002_auto_20161003_1610.py delete mode 100644 courses/migrations/0003_activityfile.py delete mode 100644 forum/migrations/0002_auto_20161003_1610.py diff --git a/core/migrations/0001_initial.py b/core/migrations/0001_initial.py index 6087ac7..48d96eb 100644 --- a/core/migrations/0001_initial.py +++ b/core/migrations/0001_initial.py @@ -1,8 +1,9 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-03 19:10 +# Generated by Django 1.10 on 2016-10-05 02:05 from __future__ import unicode_literals import autoslug.fields +from django.conf import settings from django.db import migrations, models import django.db.models.deletion @@ -12,6 +13,7 @@ class Migration(migrations.Migration): initial = True dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] operations = [ @@ -31,6 +33,7 @@ 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_plural': 'Action_Resources', @@ -42,6 +45,8 @@ 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_plural': 'Logs', @@ -56,6 +61,8 @@ 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_plural': 'Notifications', @@ -76,4 +83,9 @@ class Migration(migrations.Migration): 'verbose_name': 'Resource', }, ), + 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_20161003_1610.py b/core/migrations/0002_auto_20161003_1610.py deleted file mode 100644 index 3be9928..0000000 --- a/core/migrations/0002_auto_20161003_1610.py +++ /dev/null @@ -1,50 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-03 19:10 -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 bd4ea3c..9738a3c 100644 --- a/courses/migrations/0001_initial.py +++ b/courses/migrations/0001_initial.py @@ -1,8 +1,9 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-03 19:10 +# Generated by Django 1.10 on 2016-10-05 02:05 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 @@ -14,6 +15,7 @@ class Migration(migrations.Migration): dependencies = [ ('core', '0001_initial'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] operations = [ @@ -23,6 +25,7 @@ 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.DateTimeField(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',), ), @@ -32,6 +35,7 @@ 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', @@ -66,6 +70,9 @@ class Migration(migrations.Migration): ('init_date', models.DateField(verbose_name='Begin of Course Date')), ('end_date', models.DateField(verbose_name='End of Course Date')), ('image', models.ImageField(blank=True, upload_to='courses/', verbose_name='Image')), + ('category', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Category', verbose_name='Category')), + ('professors', models.ManyToManyField(related_name='courses_professors', to=settings.AUTH_USER_MODEL, verbose_name='Professors')), + ('students', models.ManyToManyField(related_name='courses_student', to=settings.AUTH_USER_MODEL, verbose_name='Students')), ], options={ 'ordering': ('create_date', 'name'), @@ -78,6 +85,7 @@ 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',), ), @@ -93,6 +101,8 @@ 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')), + ('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='subjects', to='courses.Course', verbose_name='Course')), + ('professors', models.ManyToManyField(related_name='subjects', to=settings.AUTH_USER_MODEL, verbose_name='Professors')), ], options={ 'ordering': ('create_date', 'name'), @@ -107,6 +117,7 @@ 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', @@ -123,6 +134,8 @@ 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={ 'ordering': ('create_date', 'name'), @@ -130,4 +143,14 @@ class Migration(migrations.Migration): '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='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_20161003_1610.py b/courses/migrations/0002_auto_20161003_1610.py deleted file mode 100644 index e06b6a9..0000000 --- a/courses/migrations/0002_auto_20161003_1610.py +++ /dev/null @@ -1,85 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-03 19:10 -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 = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('courses', '0001_initial'), - ] - - 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='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='subjects', to=settings.AUTH_USER_MODEL, verbose_name='Professors'), - ), - 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='course', - name='category', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Category', 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/courses/migrations/0003_activityfile.py b/courses/migrations/0003_activityfile.py deleted file mode 100644 index a4cfb1a..0000000 --- a/courses/migrations/0003_activityfile.py +++ /dev/null @@ -1,30 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-03 16:10 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion -import s3direct.fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('courses', '0002_auto_20161001_2117'), - ] - - operations = [ - migrations.CreateModel( - name='ActivityFile', - fields=[ - ('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', - }, - ), - ] diff --git a/forum/migrations/0001_initial.py b/forum/migrations/0001_initial.py index ac94287..59abf64 100644 --- a/forum/migrations/0001_initial.py +++ b/forum/migrations/0001_initial.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-03 19:10 +# Generated by Django 1.10 on 2016-10-05 02:05 from __future__ import unicode_literals +from django.conf import settings from django.db import migrations, models import django.db.models.deletion @@ -12,6 +13,7 @@ class Migration(migrations.Migration): dependencies = [ ('courses', '0001_initial'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] operations = [ @@ -36,6 +38,8 @@ 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_plural': 'Posts', @@ -50,6 +54,7 @@ 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_plural': 'Post Answers', diff --git a/forum/migrations/0002_auto_20161003_1610.py b/forum/migrations/0002_auto_20161003_1610.py deleted file mode 100644 index 485de21..0000000 --- a/forum/migrations/0002_auto_20161003_1610.py +++ /dev/null @@ -1,35 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-03 19:10 -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/poll/migrations/0001_initial.py b/poll/migrations/0001_initial.py index 62a77f1..e1ac67d 100644 --- a/poll/migrations/0001_initial.py +++ b/poll/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-03 19:10 +# Generated by Django 1.10 on 2016-10-05 02:05 from __future__ import unicode_literals from django.db import migrations, models -- libgit2 0.21.2