diff --git a/core/migrations/0001_initial.py b/core/migrations/0001_initial.py index b15e8b4..94f1d10 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-12-13 03:54 +# Generated by Django 1.10 on 2016-12-13 05:50 from __future__ import unicode_literals import autoslug.fields -from django.conf import settings import django.contrib.postgres.fields.jsonb from django.db import migrations, models import django.db.models.deletion @@ -14,7 +13,6 @@ class Migration(migrations.Migration): initial = True dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] operations = [ @@ -27,19 +25,18 @@ class Migration(migrations.Migration): ('created_date', models.DateTimeField(auto_now_add=True, verbose_name='Created Date')), ], options={ - 'verbose_name': 'Action', 'verbose_name_plural': 'Actions', + 'verbose_name': 'Action', }, ), migrations.CreateModel( 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', 'verbose_name_plural': 'Action_Resources', + 'verbose_name': 'Action_Resource', }, ), migrations.CreateModel( @@ -49,12 +46,10 @@ class Migration(migrations.Migration): ('component', models.TextField(verbose_name='Component (Module / App)')), ('context', django.contrib.postgres.fields.jsonb.JSONField(blank=True, verbose_name='Context')), ('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', 'verbose_name_plural': 'Logs', + 'verbose_name': 'Log', }, ), migrations.CreateModel( @@ -65,8 +60,8 @@ class Migration(migrations.Migration): ('icon', models.CharField(max_length=50, verbose_name='Icon')), ], options={ - 'verbose_name': 'Amadeus Mime Type', 'verbose_name_plural': 'Amadeus Mime Types', + 'verbose_name': 'Amadeus Mime Type', }, ), migrations.CreateModel( @@ -77,12 +72,10 @@ 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='Performer')), - ('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', 'verbose_name_plural': 'Notifications', + 'verbose_name': 'Notification', }, ), migrations.CreateModel( @@ -95,13 +88,8 @@ class Migration(migrations.Migration): ('url', models.CharField(default='', max_length=100, verbose_name='URL')), ], options={ - 'verbose_name': 'Resource', 'verbose_name_plural': 'Resources', + '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_20161213_0250.py b/core/migrations/0002_auto_20161213_0250.py new file mode 100644 index 0000000..69992bf --- /dev/null +++ b/core/migrations/0002_auto_20161213_0250.py @@ -0,0 +1,50 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-12-13 05:50 +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), + ('core', '0001_initial'), + ] + + 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='Performer'), + ), + 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 9944df8..a245fd2 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-12-13 03:54 +# Generated by Django 1.10 on 2016-12-13 05:50 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,7 +13,6 @@ class Migration(migrations.Migration): initial = True dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), ('core', '0001_initial'), ] @@ -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': 'Activity File', 'verbose_name_plural': 'Activitys Files', + 'verbose_name': 'Activity File', }, ), migrations.CreateModel( @@ -51,8 +47,8 @@ class Migration(migrations.Migration): ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')), ], options={ - 'verbose_name': 'Category', 'verbose_name_plural': 'Categories', + 'verbose_name': 'Category', }, ), migrations.CreateModel( @@ -79,8 +75,8 @@ class Migration(migrations.Migration): ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')), ], options={ - 'verbose_name': 'Category', 'verbose_name_plural': 'Categories', + 'verbose_name': 'Category', }, ), migrations.CreateModel( @@ -105,7 +101,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',), ), @@ -123,8 +118,6 @@ class Migration(migrations.Migration): ('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(blank=True, related_name='subject_student', to=settings.AUTH_USER_MODEL, verbose_name='Students')), ], options={ 'verbose_name_plural': 'Subjects', @@ -142,8 +135,8 @@ class Migration(migrations.Migration): ('subjects', models.ManyToManyField(to='courses.Subject')), ], options={ - 'verbose_name': 'subject category', 'verbose_name_plural': 'subject categories', + 'verbose_name': 'subject category', }, ), migrations.CreateModel( @@ -164,44 +157,4 @@ class Migration(migrations.Migration): 'ordering': ('create_date', 'name'), }, ), - 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='coordenator', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='course_coordenator', to=settings.AUTH_USER_MODEL, verbose_name='Coordenator'), - ), - 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(blank=True, 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_20161213_0250.py b/courses/migrations/0002_auto_20161213_0250.py new file mode 100644 index 0000000..4c446b0 --- /dev/null +++ b/courses/migrations/0002_auto_20161213_0250.py @@ -0,0 +1,85 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-12-13 05:50 +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='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(blank=True, 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='coordenator', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='course_coordenator', to=settings.AUTH_USER_MODEL, verbose_name='Coordenator'), + ), + 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(blank=True, 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 6e1ebf1..e9f641f 100644 --- a/exam/migrations/0001_initial.py +++ b/exam/migrations/0001_initial.py @@ -1,8 +1,7 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-12-13 03:55 +# Generated by Django 1.10 on 2016-12-13 05:50 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 = [ @@ -33,9 +31,9 @@ class Migration(migrations.Migration): ('order', models.PositiveSmallIntegerField(verbose_name='Order')), ], options={ + 'verbose_name_plural': 'Answers', 'verbose_name': 'Answer', 'ordering': ('order',), - 'verbose_name_plural': 'Answers', }, ), migrations.CreateModel( @@ -47,8 +45,8 @@ class Migration(migrations.Migration): ('answer', models.ManyToManyField(related_name='student_answer', to='exam.Answer', verbose_name='Answers Students')), ], options={ - 'verbose_name': 'Answer Stundent', 'verbose_name_plural': 'Answers Student', + 'verbose_name': 'Answer Stundent', }, ), migrations.CreateModel( @@ -61,8 +59,8 @@ class Migration(migrations.Migration): ('exibe', models.BooleanField(default=False, verbose_name='Exibe?')), ], options={ - 'verbose_name': 'Exam', 'verbose_name_plural': 'Exams', + 'verbose_name': 'Exam', }, bases=('courses.activity',), ), @@ -79,19 +77,4 @@ class Migration(migrations.Migration): name='exam', field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='student_exam', to='exam.Exam', verbose_name='Exam'), ), - migrations.AddField( - model_name='answersstudent', - name='student', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='student', to=settings.AUTH_USER_MODEL, verbose_name='Student'), - ), - migrations.AddField( - model_name='answer', - name='exam', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers', to='exam.Exam', verbose_name='Answers'), - ), - migrations.AddField( - model_name='alternative', - name='question', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='alternative_question', to='exam.Question', verbose_name='Question'), - ), ] diff --git a/exam/migrations/0002_auto_20161213_0250.py b/exam/migrations/0002_auto_20161213_0250.py new file mode 100644 index 0000000..a618473 --- /dev/null +++ b/exam/migrations/0002_auto_20161213_0250.py @@ -0,0 +1,35 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-12-13 05:50 +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 = [ + ('exam', '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='student', to=settings.AUTH_USER_MODEL, verbose_name='Student'), + ), + migrations.AddField( + model_name='answer', + name='exam', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers', to='exam.Exam', verbose_name='Answers'), + ), + migrations.AddField( + model_name='alternative', + name='question', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='alternative_question', to='exam.Question', verbose_name='Question'), + ), + ] diff --git a/files/migrations/0001_initial.py b/files/migrations/0001_initial.py index a34a1d5..5d1b6f6 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-12-13 03:59 +# Generated by Django 1.10 on 2016-12-13 05:50 from __future__ import unicode_literals -from django.conf import settings from django.db import migrations, models import django.db.models.deletion import files.models @@ -14,7 +13,6 @@ class Migration(migrations.Migration): dependencies = [ ('courses', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), ('core', '0001_initial'), ] @@ -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': 'File', 'verbose_name_plural': 'Files', + 'verbose_name': 'File', '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..7fdf6aa --- /dev/null +++ b/files/migrations/0002_topicfile_professor.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-12-13 05:50 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('files', '0001_initial'), + ] + + 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 4aeba28..3725a05 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-12-13 04:00 +# Generated by Django 1.10 on 2016-12-13 05:50 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'), ] @@ -26,8 +24,8 @@ class Migration(migrations.Migration): ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Create Date')), ], options={ - 'verbose_name': 'Forum', 'verbose_name_plural': 'Foruns', + 'verbose_name': 'Forum', }, bases=('courses.activity',), ), @@ -38,12 +36,10 @@ 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', 'verbose_name_plural': 'Posts', + 'verbose_name': 'Post', }, ), migrations.CreateModel( @@ -54,11 +50,10 @@ 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', 'verbose_name_plural': 'Post Answers', + 'verbose_name': 'Post Answer', }, ), ] diff --git a/forum/migrations/0002_auto_20161213_0250.py b/forum/migrations/0002_auto_20161213_0250.py new file mode 100644 index 0000000..0d52a70 --- /dev/null +++ b/forum/migrations/0002_auto_20161213_0250.py @@ -0,0 +1,35 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-12-13 05:50 +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 a20e7e1..0e15e88 100644 --- a/links/migrations/0001_initial.py +++ b/links/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-12-13 04:00 +# Generated by Django 1.10 on 2016-12-13 05:50 from __future__ import unicode_literals from django.db import migrations, models @@ -24,8 +24,8 @@ class Migration(migrations.Migration): ('image', models.ImageField(blank=True, upload_to='links/')), ], options={ - 'verbose_name': 'Link', 'verbose_name_plural': 'Links', + 'verbose_name': 'Link', }, bases=('courses.material',), ), diff --git a/poll/migrations/0001_initial.py b/poll/migrations/0001_initial.py index 6c791f6..a6ad200 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-12-13 04:00 +# Generated by Django 1.10 on 2016-12-13 05:50 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,9 +23,9 @@ class Migration(migrations.Migration): ('order', models.PositiveSmallIntegerField(verbose_name='Order')), ], options={ + 'verbose_name_plural': 'Answers', 'verbose_name': 'Answer', 'ordering': ('order',), - 'verbose_name_plural': 'Answers', }, ), migrations.CreateModel( @@ -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': 'Answer Stundent', 'verbose_name_plural': 'Answers Student', + 'verbose_name': 'Answer Stundent', }, ), 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': 'Poll', 'verbose_name_plural': 'Polls', + 'verbose_name': 'Poll', }, 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_20161213_0250.py b/poll/migrations/0002_auto_20161213_0250.py new file mode 100644 index 0000000..804c790 --- /dev/null +++ b/poll/migrations/0002_auto_20161213_0250.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-12-13 05:50 +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), + ('poll', '0001_initial'), + ] + + 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 d4a035f..5947f97 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-12-13 03:54 +# Generated by Django 1.10 on 2016-12-13 05:50 from __future__ import unicode_literals import django.contrib.auth.models @@ -46,8 +46,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': 'User', 'verbose_name_plural': 'Users', + 'verbose_name': 'User', }, managers=[ ('objects', django.contrib.auth.models.UserManager()), -- libgit2 0.21.2