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