From 4d7c6f747e25d1cb3fc6f00affd9ef69c73c2584 Mon Sep 17 00:00:00 2001 From: Matheus Lins Date: Tue, 4 Oct 2016 21:50:52 -0300 Subject: [PATCH] some migrations and onde modify in settings --- amadeus/settings.py | 5 ++--- core/migrations/0001_initial.py | 12 ++++++------ core/migrations/0002_auto_20161001_2117.py | 50 -------------------------------------------------- core/migrations/0002_auto_20161003_1610.py | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ courses/migrations/0001_initial.py | 25 +++++++++++++++++++------ courses/migrations/0002_auto_20161001_2117.py | 80 -------------------------------------------------------------------------------- courses/migrations/0002_auto_20161003_1610.py | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ forum/migrations/0001_initial.py | 8 ++++---- forum/migrations/0002_auto_20161001_2117.py | 35 ----------------------------------- forum/migrations/0002_auto_20161003_1610.py | 35 +++++++++++++++++++++++++++++++++++ poll/migrations/0001_initial.py | 6 +++--- users/migrations/0001_initial.py | 4 ++-- 12 files changed, 206 insertions(+), 189 deletions(-) delete mode 100644 core/migrations/0002_auto_20161001_2117.py create mode 100644 core/migrations/0002_auto_20161003_1610.py delete mode 100644 courses/migrations/0002_auto_20161001_2117.py create mode 100644 courses/migrations/0002_auto_20161003_1610.py delete mode 100644 forum/migrations/0002_auto_20161001_2117.py create mode 100644 forum/migrations/0002_auto_20161003_1610.py diff --git a/amadeus/settings.py b/amadeus/settings.py index 10a51f1..7d1065b 100644 --- a/amadeus/settings.py +++ b/amadeus/settings.py @@ -42,14 +42,14 @@ INSTALLED_APPS = [ 'rolepermissions', 'rest_framework', 'django_bootstrap_breadcrumbs', + 's3direct', + 'users', 'core', 'app', 'courses', - 'users', 'forum', 'poll', - 's3direct', ] MIDDLEWARE_CLASSES = [ @@ -207,7 +207,6 @@ S3DIRECT_DESTINATIONS = { } - try: from .local_settings import * except ImportError: diff --git a/core/migrations/0001_initial.py b/core/migrations/0001_initial.py index f9e6c58..6087ac7 100644 --- a/core/migrations/0001_initial.py +++ b/core/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-02 00:17 +# Generated by Django 1.10 on 2016-10-03 19:10 from __future__ import unicode_literals import autoslug.fields @@ -23,8 +23,8 @@ class Migration(migrations.Migration): ('created_date', models.DateField(auto_now_add=True, verbose_name='Created Date')), ], options={ - 'verbose_name': 'Action', 'verbose_name_plural': 'Actions', + 'verbose_name': 'Action', }, ), migrations.CreateModel( @@ -33,8 +33,8 @@ class Migration(migrations.Migration): ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ], options={ - 'verbose_name': 'Action_Resource', 'verbose_name_plural': 'Action_Resources', + 'verbose_name': 'Action_Resource', }, ), migrations.CreateModel( @@ -44,8 +44,8 @@ class Migration(migrations.Migration): ('datetime', models.DateTimeField(auto_now_add=True, verbose_name='Date and Time of action')), ], options={ - 'verbose_name': 'Log', 'verbose_name_plural': 'Logs', + 'verbose_name': 'Log', }, ), migrations.CreateModel( @@ -58,8 +58,8 @@ class Migration(migrations.Migration): ('action_resource', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action_Resource', verbose_name='Action_Resource')), ], options={ - 'verbose_name': 'Notification', 'verbose_name_plural': 'Notifications', + 'verbose_name': 'Notification', }, ), migrations.CreateModel( @@ -72,8 +72,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', }, ), ] diff --git a/core/migrations/0002_auto_20161001_2117.py b/core/migrations/0002_auto_20161001_2117.py deleted file mode 100644 index c370bcb..0000000 --- a/core/migrations/0002_auto_20161001_2117.py +++ /dev/null @@ -1,50 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-02 00:17 -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='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/core/migrations/0002_auto_20161003_1610.py b/core/migrations/0002_auto_20161003_1610.py new file mode 100644 index 0000000..3be9928 --- /dev/null +++ b/core/migrations/0002_auto_20161003_1610.py @@ -0,0 +1,50 @@ +# -*- 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 f103f81..bd4ea3c 100644 --- a/courses/migrations/0001_initial.py +++ b/courses/migrations/0001_initial.py @@ -1,10 +1,11 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-02 00:17 +# Generated by Django 1.10 on 2016-10-03 19:10 from __future__ import unicode_literals import autoslug.fields from django.db import migrations, models import django.db.models.deletion +import s3direct.fields class Migration(migrations.Migration): @@ -26,6 +27,18 @@ class Migration(migrations.Migration): bases=('core.resource',), ), 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)), + ], + options={ + 'verbose_name_plural': 'Activitys Files', + 'verbose_name': 'Activity File', + }, + ), + migrations.CreateModel( name='Category', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), @@ -34,8 +47,8 @@ class Migration(migrations.Migration): ('create_date', models.DateField(auto_now_add=True, verbose_name='Creation Date')), ], options={ - 'verbose_name': 'Category', 'verbose_name_plural': 'Categories', + 'verbose_name': 'Category', }, ), migrations.CreateModel( @@ -56,8 +69,8 @@ class Migration(migrations.Migration): ], options={ 'ordering': ('create_date', 'name'), - 'verbose_name': 'Course', 'verbose_name_plural': 'Courses', + 'verbose_name': 'Course', }, ), migrations.CreateModel( @@ -83,8 +96,8 @@ class Migration(migrations.Migration): ], options={ 'ordering': ('create_date', 'name'), - 'verbose_name': 'Subject', 'verbose_name_plural': 'Subjects', + 'verbose_name': 'Subject', }, ), migrations.CreateModel( @@ -96,8 +109,8 @@ class Migration(migrations.Migration): ('description', models.TextField(blank=True, verbose_name='Description')), ], options={ - 'verbose_name': 'subject category', 'verbose_name_plural': 'subject categories', + 'verbose_name': 'subject category', }, ), migrations.CreateModel( @@ -113,8 +126,8 @@ class Migration(migrations.Migration): ], options={ 'ordering': ('create_date', 'name'), - 'verbose_name': 'Topic', 'verbose_name_plural': 'Topics', + 'verbose_name': 'Topic', }, ), ] diff --git a/courses/migrations/0002_auto_20161001_2117.py b/courses/migrations/0002_auto_20161001_2117.py deleted file mode 100644 index 40f3582..0000000 --- a/courses/migrations/0002_auto_20161001_2117.py +++ /dev/null @@ -1,80 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-02 00:17 -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='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='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/0002_auto_20161003_1610.py b/courses/migrations/0002_auto_20161003_1610.py new file mode 100644 index 0000000..e06b6a9 --- /dev/null +++ b/courses/migrations/0002_auto_20161003_1610.py @@ -0,0 +1,85 @@ +# -*- 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/forum/migrations/0001_initial.py b/forum/migrations/0001_initial.py index 8a003ad..ac94287 100644 --- a/forum/migrations/0001_initial.py +++ b/forum/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-02 00:17 +# Generated by Django 1.10 on 2016-10-03 19:10 from __future__ import unicode_literals from django.db import migrations, models @@ -24,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,8 +38,8 @@ class Migration(migrations.Migration): ('post_date', models.DateTimeField(auto_now_add=True, verbose_name='Post Date')), ], options={ - 'verbose_name': 'Post', 'verbose_name_plural': 'Posts', + 'verbose_name': 'Post', }, ), migrations.CreateModel( @@ -52,8 +52,8 @@ class Migration(migrations.Migration): ('post', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='forum.Post', verbose_name='Post')), ], options={ - 'verbose_name': 'Post Answer', 'verbose_name_plural': 'Post Answers', + 'verbose_name': 'Post Answer', }, ), ] diff --git a/forum/migrations/0002_auto_20161001_2117.py b/forum/migrations/0002_auto_20161001_2117.py deleted file mode 100644 index 1761dca..0000000 --- a/forum/migrations/0002_auto_20161001_2117.py +++ /dev/null @@ -1,35 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-02 00:17 -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), - ('forum', '0001_initial'), - ] - - 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/forum/migrations/0002_auto_20161003_1610.py b/forum/migrations/0002_auto_20161003_1610.py new file mode 100644 index 0000000..485de21 --- /dev/null +++ b/forum/migrations/0002_auto_20161003_1610.py @@ -0,0 +1,35 @@ +# -*- 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 3678e2f..62a77f1 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-02 00:17 +# Generated by Django 1.10 on 2016-10-03 19:10 from __future__ import unicode_literals from django.db import migrations, models @@ -24,8 +24,8 @@ class Migration(migrations.Migration): ], options={ 'ordering': ('order',), - 'verbose_name': 'Answer', 'verbose_name_plural': 'Answers', + 'verbose_name': 'Answer', }, ), migrations.CreateModel( @@ -34,8 +34,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',), ), diff --git a/users/migrations/0001_initial.py b/users/migrations/0001_initial.py index 050f332..7ad5120 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-02 00:17 +# Generated by Django 1.10 on 2016-10-03 19:10 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': 'User', 'verbose_name_plural': 'Users', + 'verbose_name': 'User', }, managers=[ ('objects', django.contrib.auth.models.UserManager()), -- libgit2 0.21.2