Download as
Browse Code »

Commit 1db785ecf9f516850ca9a375e182b838aae5589e

Authored by ailsoncgt
1 parent 0ae15162
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

Fixing migration errors

Showing 6 changed files with 23 additions and 23 deletions   Show diff stats
core/migrations/0001_initial.py
  Diff comments   View file @1db785e
1 1 # -*- coding: utf-8 -*-
2   -# Generated by Django 1.10 on 2016-10-05 02:05
  2 +# Generated by Django 1.10 on 2016-10-05 13:37
3 3 from __future__ import unicode_literals
4 4  
5 5 import autoslug.fields
... ... @@ -25,8 +25,8 @@ class Migration(migrations.Migration):
25 25 ('created_date', models.DateField(auto_now_add=True, verbose_name='Created Date')),
26 26 ],
27 27 options={
28   - 'verbose_name_plural': 'Actions',
29 28 'verbose_name': 'Action',
  29 + 'verbose_name_plural': 'Actions',
30 30 },
31 31 ),
32 32 migrations.CreateModel(
... ... @@ -36,8 +36,8 @@ class Migration(migrations.Migration):
36 36 ('action', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action', verbose_name='Action_Applied')),
37 37 ],
38 38 options={
39   - 'verbose_name_plural': 'Action_Resources',
40 39 'verbose_name': 'Action_Resource',
  40 + 'verbose_name_plural': 'Action_Resources',
41 41 },
42 42 ),
43 43 migrations.CreateModel(
... ... @@ -49,8 +49,8 @@ class Migration(migrations.Migration):
49 49 ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Actor')),
50 50 ],
51 51 options={
52   - 'verbose_name_plural': 'Logs',
53 52 'verbose_name': 'Log',
  53 + 'verbose_name_plural': 'Logs',
54 54 },
55 55 ),
56 56 migrations.CreateModel(
... ... @@ -65,8 +65,8 @@ class Migration(migrations.Migration):
65 65 ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='notification_Actor', to=settings.AUTH_USER_MODEL, verbose_name='User')),
66 66 ],
67 67 options={
68   - 'verbose_name_plural': 'Notifications',
69 68 'verbose_name': 'Notification',
  69 + 'verbose_name_plural': 'Notifications',
70 70 },
71 71 ),
72 72 migrations.CreateModel(
... ... @@ -79,8 +79,8 @@ class Migration(migrations.Migration):
79 79 ('url', models.CharField(default='', max_length=100, verbose_name='URL')),
80 80 ],
81 81 options={
82   - 'verbose_name_plural': 'Resources',
83 82 'verbose_name': 'Resource',
  83 + 'verbose_name_plural': 'Resources',
84 84 },
85 85 ),
86 86 migrations.AddField(
... ...
courses/migrations/0001_initial.py
  Diff comments   View file @1db785e
1 1 # -*- coding: utf-8 -*-
2   -# Generated by Django 1.10 on 2016-10-05 02:05
  2 +# Generated by Django 1.10 on 2016-10-05 13:37
3 3 from __future__ import unicode_literals
4 4  
5 5 import autoslug.fields
... ... @@ -14,8 +14,8 @@ class Migration(migrations.Migration):
14 14 initial = True
15 15  
16 16 dependencies = [
17   - ('core', '0001_initial'),
18 17 migrations.swappable_dependency(settings.AUTH_USER_MODEL),
  18 + ('core', '0001_initial'),
19 19 ]
20 20  
21 21 operations = [
... ... @@ -38,8 +38,8 @@ class Migration(migrations.Migration):
38 38 ('diet', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='files', to='courses.Activity')),
39 39 ],
40 40 options={
41   - 'verbose_name_plural': 'Activitys Files',
42 41 'verbose_name': 'Activity File',
  42 + 'verbose_name_plural': 'Activitys Files',
43 43 },
44 44 ),
45 45 migrations.CreateModel(
... ... @@ -51,8 +51,8 @@ class Migration(migrations.Migration):
51 51 ('create_date', models.DateField(auto_now_add=True, verbose_name='Creation Date')),
52 52 ],
53 53 options={
54   - 'verbose_name_plural': 'Categories',
55 54 'verbose_name': 'Category',
  55 + 'verbose_name_plural': 'Categories',
56 56 },
57 57 ),
58 58 migrations.CreateModel(
... ... @@ -75,9 +75,9 @@ class Migration(migrations.Migration):
75 75 ('students', models.ManyToManyField(related_name='courses_student', to=settings.AUTH_USER_MODEL, verbose_name='Students')),
76 76 ],
77 77 options={
  78 + 'verbose_name': 'Course',
78 79 'ordering': ('create_date', 'name'),
79 80 'verbose_name_plural': 'Courses',
80   - 'verbose_name': 'Course',
81 81 },
82 82 ),
83 83 migrations.CreateModel(
... ... @@ -105,9 +105,9 @@ class Migration(migrations.Migration):
105 105 ('professors', models.ManyToManyField(related_name='subjects', to=settings.AUTH_USER_MODEL, verbose_name='Professors')),
106 106 ],
107 107 options={
  108 + 'verbose_name': 'Subject',
108 109 'ordering': ('create_date', 'name'),
109 110 'verbose_name_plural': 'Subjects',
110   - 'verbose_name': 'Subject',
111 111 },
112 112 ),
113 113 migrations.CreateModel(
... ... @@ -120,8 +120,8 @@ class Migration(migrations.Migration):
120 120 ('subjects', models.ManyToManyField(to='courses.Subject')),
121 121 ],
122 122 options={
123   - 'verbose_name_plural': 'subject categories',
124 123 'verbose_name': 'subject category',
  124 + 'verbose_name_plural': 'subject categories',
125 125 },
126 126 ),
127 127 migrations.CreateModel(
... ... @@ -138,9 +138,9 @@ class Migration(migrations.Migration):
138 138 ('subject', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Subject', verbose_name='Subject')),
139 139 ],
140 140 options={
  141 + 'verbose_name': 'Topic',
141 142 'ordering': ('create_date', 'name'),
142 143 'verbose_name_plural': 'Topics',
143   - 'verbose_name': 'Topic',
144 144 },
145 145 ),
146 146 migrations.AddField(
... ...
forum/migrations/0001_initial.py
  Diff comments   View file @1db785e
1 1 # -*- coding: utf-8 -*-
2   -# Generated by Django 1.10 on 2016-10-05 02:05
  2 +# Generated by Django 1.10 on 2016-10-05 13:38
3 3 from __future__ import unicode_literals
4 4  
5 5 from django.conf import settings
... ... @@ -26,8 +26,8 @@ class Migration(migrations.Migration):
26 26 ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Create Date')),
27 27 ],
28 28 options={
29   - 'verbose_name_plural': 'Foruns',
30 29 'verbose_name': 'Forum',
  30 + 'verbose_name_plural': 'Foruns',
31 31 },
32 32 bases=('courses.activity',),
33 33 ),
... ... @@ -42,8 +42,8 @@ class Migration(migrations.Migration):
42 42 ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Autor')),
43 43 ],
44 44 options={
45   - 'verbose_name_plural': 'Posts',
46 45 'verbose_name': 'Post',
  46 + 'verbose_name_plural': 'Posts',
47 47 },
48 48 ),
49 49 migrations.CreateModel(
... ... @@ -57,8 +57,8 @@ class Migration(migrations.Migration):
57 57 ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Autor')),
58 58 ],
59 59 options={
60   - 'verbose_name_plural': 'Post Answers',
61 60 'verbose_name': 'Post Answer',
  61 + 'verbose_name_plural': 'Post Answers',
62 62 },
63 63 ),
64 64 ]
... ...
links/migrations/__init__.py
View file @0ae1516
poll/migrations/0001_initial.py
  Diff comments   View file @1db785e
1 1 # -*- coding: utf-8 -*-
2   -# Generated by Django 1.10 on 2016-10-05 02:05
  2 +# Generated by Django 1.10 on 2016-10-05 13:38
3 3 from __future__ import unicode_literals
4 4  
5 5 from django.db import migrations, models
... ... @@ -23,9 +23,9 @@ class Migration(migrations.Migration):
23 23 ('order', models.PositiveSmallIntegerField(verbose_name='Order')),
24 24 ],
25 25 options={
26   - 'ordering': ('order',),
27   - 'verbose_name_plural': 'Answers',
28 26 'verbose_name': 'Answer',
  27 + 'verbose_name_plural': 'Answers',
  28 + 'ordering': ('order',),
29 29 },
30 30 ),
31 31 migrations.CreateModel(
... ...
users/migrations/0001_initial.py
  Diff comments   View file @1db785e
1 1 # -*- coding: utf-8 -*-
2   -# Generated by Django 1.10 on 2016-10-03 19:10
  2 +# Generated by Django 1.10 on 2016-10-05 13:37
3 3 from __future__ import unicode_literals
4 4  
5 5 import django.contrib.auth.models
... ... @@ -42,8 +42,8 @@ class Migration(migrations.Migration):
42 42 ('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')),
43 43 ],
44 44 options={
45   - 'verbose_name_plural': 'Users',
46 45 'verbose_name': 'User',
  46 + 'verbose_name_plural': 'Users',
47 47 },
48 48 managers=[
49 49 ('objects', django.contrib.auth.models.UserManager()),
... ...