Download as
Browse Code »

Commit 4d7c6f747e25d1cb3fc6f00affd9ef69c73c2584

Authored by Matheus Lins
1 parent 98d703b0
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

some migrations and onde modify in settings

Showing 12 changed files with 206 additions and 189 deletions   Show diff stats
amadeus/settings.py
  Diff comments   View file @4d7c6f7
... ... @@ -42,14 +42,14 @@ INSTALLED_APPS = [
42 42 'rolepermissions',
43 43 'rest_framework',
44 44 'django_bootstrap_breadcrumbs',
  45 + 's3direct',
45 46  
  47 + 'users',
46 48 'core',
47 49 'app',
48 50 'courses',
49   - 'users',
50 51 'forum',
51 52 'poll',
52   - 's3direct',
53 53 ]
54 54  
55 55 MIDDLEWARE_CLASSES = [
... ... @@ -207,7 +207,6 @@ S3DIRECT_DESTINATIONS = {
207 207  
208 208 }
209 209  
210   -
211 210 try:
212 211 from .local_settings import *
213 212 except ImportError:
... ...
core/migrations/0001_initial.py
  Diff comments   View file @4d7c6f7
1 1 # -*- coding: utf-8 -*-
2   -# Generated by Django 1.10 on 2016-10-02 00:17
  2 +# Generated by Django 1.10 on 2016-10-03 19:10
3 3 from __future__ import unicode_literals
4 4  
5 5 import autoslug.fields
... ... @@ -23,8 +23,8 @@ class Migration(migrations.Migration):
23 23 ('created_date', models.DateField(auto_now_add=True, verbose_name='Created Date')),
24 24 ],
25 25 options={
26   - 'verbose_name': 'Action',
27 26 'verbose_name_plural': 'Actions',
  27 + 'verbose_name': 'Action',
28 28 },
29 29 ),
30 30 migrations.CreateModel(
... ... @@ -33,8 +33,8 @@ class Migration(migrations.Migration):
33 33 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
34 34 ],
35 35 options={
36   - 'verbose_name': 'Action_Resource',
37 36 'verbose_name_plural': 'Action_Resources',
  37 + 'verbose_name': 'Action_Resource',
38 38 },
39 39 ),
40 40 migrations.CreateModel(
... ... @@ -44,8 +44,8 @@ class Migration(migrations.Migration):
44 44 ('datetime', models.DateTimeField(auto_now_add=True, verbose_name='Date and Time of action')),
45 45 ],
46 46 options={
47   - 'verbose_name': 'Log',
48 47 'verbose_name_plural': 'Logs',
  48 + 'verbose_name': 'Log',
49 49 },
50 50 ),
51 51 migrations.CreateModel(
... ... @@ -58,8 +58,8 @@ class Migration(migrations.Migration):
58 58 ('action_resource', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action_Resource', verbose_name='Action_Resource')),
59 59 ],
60 60 options={
61   - 'verbose_name': 'Notification',
62 61 'verbose_name_plural': 'Notifications',
  62 + 'verbose_name': 'Notification',
63 63 },
64 64 ),
65 65 migrations.CreateModel(
... ... @@ -72,8 +72,8 @@ class Migration(migrations.Migration):
72 72 ('url', models.CharField(default='', max_length=100, verbose_name='URL')),
73 73 ],
74 74 options={
75   - 'verbose_name': 'Resource',
76 75 'verbose_name_plural': 'Resources',
  76 + 'verbose_name': 'Resource',
77 77 },
78 78 ),
79 79 ]
... ...
core/migrations/0002_auto_20161001_2117.py
View file @98d703b
... ... @@ -1,50 +0,0 @@
1   -# -*- coding: utf-8 -*-
2   -# Generated by Django 1.10 on 2016-10-02 00:17
3   -from __future__ import unicode_literals
4   -
5   -from django.conf import settings
6   -from django.db import migrations, models
7   -import django.db.models.deletion
8   -
9   -
10   -class Migration(migrations.Migration):
11   -
12   - initial = True
13   -
14   - dependencies = [
15   - migrations.swappable_dependency(settings.AUTH_USER_MODEL),
16   - ('core', '0001_initial'),
17   - ]
18   -
19   - operations = [
20   - migrations.AddField(
21   - model_name='notification',
22   - name='actor',
23   - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='notification_Performer', to=settings.AUTH_USER_MODEL, verbose_name='Perfomer'),
24   - ),
25   - migrations.AddField(
26   - model_name='notification',
27   - name='user',
28   - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='notification_Actor', to=settings.AUTH_USER_MODEL, verbose_name='User'),
29   - ),
30   - migrations.AddField(
31   - model_name='log',
32   - name='action_resource',
33   - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action_Resource', verbose_name='Action_Resource'),
34   - ),
35   - migrations.AddField(
36   - model_name='log',
37   - name='user',
38   - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Actor'),
39   - ),
40   - migrations.AddField(
41   - model_name='action_resource',
42   - name='action',
43   - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action', verbose_name='Action_Applied'),
44   - ),
45   - migrations.AddField(
46   - model_name='action_resource',
47   - name='resource',
48   - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Resource', verbose_name='Resource'),
49   - ),
50   - ]
core/migrations/0002_auto_20161003_1610.py 0 → 100644
  Diff comments   View file @4d7c6f7
... ... @@ -0,0 +1,50 @@
  1 +# -*- coding: utf-8 -*-
  2 +# Generated by Django 1.10 on 2016-10-03 19:10
  3 +from __future__ import unicode_literals
  4 +
  5 +from django.conf import settings
  6 +from django.db import migrations, models
  7 +import django.db.models.deletion
  8 +
  9 +
  10 +class Migration(migrations.Migration):
  11 +
  12 + initial = True
  13 +
  14 + dependencies = [
  15 + ('core', '0001_initial'),
  16 + migrations.swappable_dependency(settings.AUTH_USER_MODEL),
  17 + ]
  18 +
  19 + operations = [
  20 + migrations.AddField(
  21 + model_name='notification',
  22 + name='actor',
  23 + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='notification_Performer', to=settings.AUTH_USER_MODEL, verbose_name='Perfomer'),
  24 + ),
  25 + migrations.AddField(
  26 + model_name='notification',
  27 + name='user',
  28 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='notification_Actor', to=settings.AUTH_USER_MODEL, verbose_name='User'),
  29 + ),
  30 + migrations.AddField(
  31 + model_name='log',
  32 + name='action_resource',
  33 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action_Resource', verbose_name='Action_Resource'),
  34 + ),
  35 + migrations.AddField(
  36 + model_name='log',
  37 + name='user',
  38 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Actor'),
  39 + ),
  40 + migrations.AddField(
  41 + model_name='action_resource',
  42 + name='action',
  43 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action', verbose_name='Action_Applied'),
  44 + ),
  45 + migrations.AddField(
  46 + model_name='action_resource',
  47 + name='resource',
  48 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Resource', verbose_name='Resource'),
  49 + ),
  50 + ]
... ...
courses/migrations/0001_initial.py
  Diff comments   View file @4d7c6f7
1 1 # -*- coding: utf-8 -*-
2   -# Generated by Django 1.10 on 2016-10-02 00:17
  2 +# Generated by Django 1.10 on 2016-10-03 19:10
3 3 from __future__ import unicode_literals
4 4  
5 5 import autoslug.fields
6 6 from django.db import migrations, models
7 7 import django.db.models.deletion
  8 +import s3direct.fields
8 9  
9 10  
10 11 class Migration(migrations.Migration):
... ... @@ -26,6 +27,18 @@ class Migration(migrations.Migration):
26 27 bases=('core.resource',),
27 28 ),
28 29 migrations.CreateModel(
  30 + name='ActivityFile',
  31 + fields=[
  32 + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
  33 + ('pdf', s3direct.fields.S3DirectField()),
  34 + ('name', models.CharField(max_length=100)),
  35 + ],
  36 + options={
  37 + 'verbose_name_plural': 'Activitys Files',
  38 + 'verbose_name': 'Activity File',
  39 + },
  40 + ),
  41 + migrations.CreateModel(
29 42 name='Category',
30 43 fields=[
31 44 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
... ... @@ -34,8 +47,8 @@ class Migration(migrations.Migration):
34 47 ('create_date', models.DateField(auto_now_add=True, verbose_name='Creation Date')),
35 48 ],
36 49 options={
37   - 'verbose_name': 'Category',
38 50 'verbose_name_plural': 'Categories',
  51 + 'verbose_name': 'Category',
39 52 },
40 53 ),
41 54 migrations.CreateModel(
... ... @@ -56,8 +69,8 @@ class Migration(migrations.Migration):
56 69 ],
57 70 options={
58 71 'ordering': ('create_date', 'name'),
59   - 'verbose_name': 'Course',
60 72 'verbose_name_plural': 'Courses',
  73 + 'verbose_name': 'Course',
61 74 },
62 75 ),
63 76 migrations.CreateModel(
... ... @@ -83,8 +96,8 @@ class Migration(migrations.Migration):
83 96 ],
84 97 options={
85 98 'ordering': ('create_date', 'name'),
86   - 'verbose_name': 'Subject',
87 99 'verbose_name_plural': 'Subjects',
  100 + 'verbose_name': 'Subject',
88 101 },
89 102 ),
90 103 migrations.CreateModel(
... ... @@ -96,8 +109,8 @@ class Migration(migrations.Migration):
96 109 ('description', models.TextField(blank=True, verbose_name='Description')),
97 110 ],
98 111 options={
99   - 'verbose_name': 'subject category',
100 112 'verbose_name_plural': 'subject categories',
  113 + 'verbose_name': 'subject category',
101 114 },
102 115 ),
103 116 migrations.CreateModel(
... ... @@ -113,8 +126,8 @@ class Migration(migrations.Migration):
113 126 ],
114 127 options={
115 128 'ordering': ('create_date', 'name'),
116   - 'verbose_name': 'Topic',
117 129 'verbose_name_plural': 'Topics',
  130 + 'verbose_name': 'Topic',
118 131 },
119 132 ),
120 133 ]
... ...
courses/migrations/0002_auto_20161001_2117.py
View file @98d703b
... ... @@ -1,80 +0,0 @@
1   -# -*- coding: utf-8 -*-
2   -# Generated by Django 1.10 on 2016-10-02 00:17
3   -from __future__ import unicode_literals
4   -
5   -from django.conf import settings
6   -from django.db import migrations, models
7   -import django.db.models.deletion
8   -
9   -
10   -class Migration(migrations.Migration):
11   -
12   - initial = True
13   -
14   - dependencies = [
15   - ('courses', '0001_initial'),
16   - migrations.swappable_dependency(settings.AUTH_USER_MODEL),
17   - ]
18   -
19   - operations = [
20   - migrations.AddField(
21   - model_name='topic',
22   - name='owner',
23   - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Owner'),
24   - ),
25   - migrations.AddField(
26   - model_name='topic',
27   - name='subject',
28   - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Subject', verbose_name='Subject'),
29   - ),
30   - migrations.AddField(
31   - model_name='subjectcategory',
32   - name='subjects',
33   - field=models.ManyToManyField(to='courses.Subject'),
34   - ),
35   - migrations.AddField(
36   - model_name='subject',
37   - name='course',
38   - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='subjects', to='courses.Course', verbose_name='Course'),
39   - ),
40   - migrations.AddField(
41   - model_name='subject',
42   - name='professors',
43   - field=models.ManyToManyField(related_name='subjects', to=settings.AUTH_USER_MODEL, verbose_name='Professors'),
44   - ),
45   - migrations.AddField(
46   - model_name='material',
47   - name='students',
48   - field=models.ManyToManyField(related_name='materials', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
49   - ),
50   - migrations.AddField(
51   - model_name='material',
52   - name='topic',
53   - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='materials', to='courses.Topic', verbose_name='Topic'),
54   - ),
55   - migrations.AddField(
56   - model_name='course',
57   - name='category',
58   - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Category', verbose_name='Category'),
59   - ),
60   - migrations.AddField(
61   - model_name='course',
62   - name='professors',
63   - field=models.ManyToManyField(related_name='courses_professors', to=settings.AUTH_USER_MODEL, verbose_name='Professors'),
64   - ),
65   - migrations.AddField(
66   - model_name='course',
67   - name='students',
68   - field=models.ManyToManyField(related_name='courses_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
69   - ),
70   - migrations.AddField(
71   - model_name='activity',
72   - name='students',
73   - field=models.ManyToManyField(related_name='activities', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
74   - ),
75   - migrations.AddField(
76   - model_name='activity',
77   - name='topic',
78   - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='activities', to='courses.Topic', verbose_name='Topic'),
79   - ),
80   - ]
courses/migrations/0002_auto_20161003_1610.py 0 → 100644
  Diff comments   View file @4d7c6f7
... ... @@ -0,0 +1,85 @@
  1 +# -*- coding: utf-8 -*-
  2 +# Generated by Django 1.10 on 2016-10-03 19:10
  3 +from __future__ import unicode_literals
  4 +
  5 +from django.conf import settings
  6 +from django.db import migrations, models
  7 +import django.db.models.deletion
  8 +
  9 +
  10 +class Migration(migrations.Migration):
  11 +
  12 + initial = True
  13 +
  14 + dependencies = [
  15 + migrations.swappable_dependency(settings.AUTH_USER_MODEL),
  16 + ('courses', '0001_initial'),
  17 + ]
  18 +
  19 + operations = [
  20 + migrations.AddField(
  21 + model_name='topic',
  22 + name='owner',
  23 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Owner'),
  24 + ),
  25 + migrations.AddField(
  26 + model_name='topic',
  27 + name='subject',
  28 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Subject', verbose_name='Subject'),
  29 + ),
  30 + migrations.AddField(
  31 + model_name='subjectcategory',
  32 + name='subjects',
  33 + field=models.ManyToManyField(to='courses.Subject'),
  34 + ),
  35 + migrations.AddField(
  36 + model_name='subject',
  37 + name='course',
  38 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='subjects', to='courses.Course', verbose_name='Course'),
  39 + ),
  40 + migrations.AddField(
  41 + model_name='subject',
  42 + name='professors',
  43 + field=models.ManyToManyField(related_name='subjects', to=settings.AUTH_USER_MODEL, verbose_name='Professors'),
  44 + ),
  45 + migrations.AddField(
  46 + model_name='material',
  47 + name='students',
  48 + field=models.ManyToManyField(related_name='materials', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
  49 + ),
  50 + migrations.AddField(
  51 + model_name='material',
  52 + name='topic',
  53 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='materials', to='courses.Topic', verbose_name='Topic'),
  54 + ),
  55 + migrations.AddField(
  56 + model_name='course',
  57 + name='category',
  58 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Category', verbose_name='Category'),
  59 + ),
  60 + migrations.AddField(
  61 + model_name='course',
  62 + name='professors',
  63 + field=models.ManyToManyField(related_name='courses_professors', to=settings.AUTH_USER_MODEL, verbose_name='Professors'),
  64 + ),
  65 + migrations.AddField(
  66 + model_name='course',
  67 + name='students',
  68 + field=models.ManyToManyField(related_name='courses_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
  69 + ),
  70 + migrations.AddField(
  71 + model_name='activityfile',
  72 + name='diet',
  73 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='files', to='courses.Activity'),
  74 + ),
  75 + migrations.AddField(
  76 + model_name='activity',
  77 + name='students',
  78 + field=models.ManyToManyField(related_name='activities', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
  79 + ),
  80 + migrations.AddField(
  81 + model_name='activity',
  82 + name='topic',
  83 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='activities', to='courses.Topic', verbose_name='Topic'),
  84 + ),
  85 + ]
... ...
forum/migrations/0001_initial.py
  Diff comments   View file @4d7c6f7
1 1 # -*- coding: utf-8 -*-
2   -# Generated by Django 1.10 on 2016-10-02 00:17
  2 +# Generated by Django 1.10 on 2016-10-03 19:10
3 3 from __future__ import unicode_literals
4 4  
5 5 from django.db import migrations, models
... ... @@ -24,8 +24,8 @@ class Migration(migrations.Migration):
24 24 ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Create Date')),
25 25 ],
26 26 options={
27   - 'verbose_name': 'Forum',
28 27 'verbose_name_plural': 'Foruns',
  28 + 'verbose_name': 'Forum',
29 29 },
30 30 bases=('courses.activity',),
31 31 ),
... ... @@ -38,8 +38,8 @@ class Migration(migrations.Migration):
38 38 ('post_date', models.DateTimeField(auto_now_add=True, verbose_name='Post Date')),
39 39 ],
40 40 options={
41   - 'verbose_name': 'Post',
42 41 'verbose_name_plural': 'Posts',
  42 + 'verbose_name': 'Post',
43 43 },
44 44 ),
45 45 migrations.CreateModel(
... ... @@ -52,8 +52,8 @@ class Migration(migrations.Migration):
52 52 ('post', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='forum.Post', verbose_name='Post')),
53 53 ],
54 54 options={
55   - 'verbose_name': 'Post Answer',
56 55 'verbose_name_plural': 'Post Answers',
  56 + 'verbose_name': 'Post Answer',
57 57 },
58 58 ),
59 59 ]
... ...
forum/migrations/0002_auto_20161001_2117.py
View file @98d703b
... ... @@ -1,35 +0,0 @@
1   -# -*- coding: utf-8 -*-
2   -# Generated by Django 1.10 on 2016-10-02 00:17
3   -from __future__ import unicode_literals
4   -
5   -from django.conf import settings
6   -from django.db import migrations, models
7   -import django.db.models.deletion
8   -
9   -
10   -class Migration(migrations.Migration):
11   -
12   - initial = True
13   -
14   - dependencies = [
15   - migrations.swappable_dependency(settings.AUTH_USER_MODEL),
16   - ('forum', '0001_initial'),
17   - ]
18   -
19   - operations = [
20   - migrations.AddField(
21   - model_name='postanswer',
22   - name='user',
23   - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Autor'),
24   - ),
25   - migrations.AddField(
26   - model_name='post',
27   - name='forum',
28   - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='forum.Forum', verbose_name='Forum'),
29   - ),
30   - migrations.AddField(
31   - model_name='post',
32   - name='user',
33   - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Autor'),
34   - ),
35   - ]
forum/migrations/0002_auto_20161003_1610.py 0 → 100644
  Diff comments   View file @4d7c6f7
... ... @@ -0,0 +1,35 @@
  1 +# -*- coding: utf-8 -*-
  2 +# Generated by Django 1.10 on 2016-10-03 19:10
  3 +from __future__ import unicode_literals
  4 +
  5 +from django.conf import settings
  6 +from django.db import migrations, models
  7 +import django.db.models.deletion
  8 +
  9 +
  10 +class Migration(migrations.Migration):
  11 +
  12 + initial = True
  13 +
  14 + dependencies = [
  15 + ('forum', '0001_initial'),
  16 + migrations.swappable_dependency(settings.AUTH_USER_MODEL),
  17 + ]
  18 +
  19 + operations = [
  20 + migrations.AddField(
  21 + model_name='postanswer',
  22 + name='user',
  23 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Autor'),
  24 + ),
  25 + migrations.AddField(
  26 + model_name='post',
  27 + name='forum',
  28 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='forum.Forum', verbose_name='Forum'),
  29 + ),
  30 + migrations.AddField(
  31 + model_name='post',
  32 + name='user',
  33 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Autor'),
  34 + ),
  35 + ]
... ...
poll/migrations/0001_initial.py
  Diff comments   View file @4d7c6f7
1 1 # -*- coding: utf-8 -*-
2   -# Generated by Django 1.10 on 2016-10-02 00:17
  2 +# Generated by Django 1.10 on 2016-10-03 19:10
3 3 from __future__ import unicode_literals
4 4  
5 5 from django.db import migrations, models
... ... @@ -24,8 +24,8 @@ class Migration(migrations.Migration):
24 24 ],
25 25 options={
26 26 'ordering': ('order',),
27   - 'verbose_name': 'Answer',
28 27 'verbose_name_plural': 'Answers',
  28 + 'verbose_name': 'Answer',
29 29 },
30 30 ),
31 31 migrations.CreateModel(
... ... @@ -34,8 +34,8 @@ class Migration(migrations.Migration):
34 34 ('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')),
35 35 ],
36 36 options={
37   - 'verbose_name': 'Poll',
38 37 'verbose_name_plural': 'Polls',
  38 + 'verbose_name': 'Poll',
39 39 },
40 40 bases=('courses.activity',),
41 41 ),
... ...
users/migrations/0001_initial.py
  Diff comments   View file @4d7c6f7
1 1 # -*- coding: utf-8 -*-
2   -# Generated by Django 1.10 on 2016-10-02 00:17
  2 +# Generated by Django 1.10 on 2016-10-03 19:10
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': 'User',
46 45 'verbose_name_plural': 'Users',
  46 + 'verbose_name': 'User',
47 47 },
48 48 managers=[
49 49 ('objects', django.contrib.auth.models.UserManager()),
... ...