Download as
Browse Code »

Commit b3beb79e684f825f6e72fd7646346674b0fbc05c

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

Fixing conflit in migrations ... core and courses ... again

Showing 7 changed files with 39 additions and 274 deletions   Show diff stats
amadeus/settings.py
  Diff comments   View file @b3beb79
... ... @@ -47,7 +47,7 @@ INSTALLED_APPS = [
47 47 'app',
48 48 'courses',
49 49 'users',
50   - 'forum',
  50 + # 'forum',
51 51 ]
52 52  
53 53 MIDDLEWARE_CLASSES = [
... ...
core/migrations/0001_initial.py
  Diff comments   View file @b3beb79
1 1 # -*- coding: utf-8 -*-
2   -# Generated by Django 1.10 on 2016-09-21 02:52
  2 +# Generated by Django 1.10 on 2016-09-22 05:46
3 3 from __future__ import unicode_literals
4 4  
5 5 import autoslug.fields
  6 +from django.conf import settings
6 7 from django.db import migrations, models
7 8 import django.db.models.deletion
8 9  
... ... @@ -12,6 +13,7 @@ class Migration(migrations.Migration):
12 13 initial = True
13 14  
14 15 dependencies = [
  16 + migrations.swappable_dependency(settings.AUTH_USER_MODEL),
15 17 ]
16 18  
17 19 operations = [
... ... @@ -31,6 +33,7 @@ class Migration(migrations.Migration):
31 33 name='Action_Resource',
32 34 fields=[
33 35 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
  36 + ('action', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action', verbose_name='Action_Applied')),
34 37 ],
35 38 options={
36 39 'verbose_name': 'Action_Resource',
... ... @@ -42,6 +45,8 @@ class Migration(migrations.Migration):
42 45 fields=[
43 46 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
44 47 ('datetime', models.DateTimeField(auto_now_add=True, verbose_name='Date and Time of action')),
  48 + ('action_resource', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action_Resource', verbose_name='Action_Resource')),
  49 + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Actor')),
45 50 ],
46 51 options={
47 52 'verbose_name': 'Log',
... ... @@ -56,6 +61,8 @@ class Migration(migrations.Migration):
56 61 ('read', models.BooleanField(default=False, verbose_name='Read')),
57 62 ('datetime', models.DateTimeField(auto_now_add=True, verbose_name='Date and Time of action')),
58 63 ('action_resource', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action_Resource', verbose_name='Action_Resource')),
  64 + ('actor', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='notification_Performer', to=settings.AUTH_USER_MODEL, verbose_name='Perfomer')),
  65 + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='notification_Actor', to=settings.AUTH_USER_MODEL, verbose_name='User')),
59 66 ],
60 67 options={
61 68 'verbose_name': 'Notification',
... ... @@ -76,4 +83,9 @@ class Migration(migrations.Migration):
76 83 'verbose_name_plural': 'Resources',
77 84 },
78 85 ),
  86 + migrations.AddField(
  87 + model_name='action_resource',
  88 + name='resource',
  89 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Resource', verbose_name='Resource'),
  90 + ),
79 91 ]
... ...
core/migrations/0002_auto_20160920_1815.py
View file @ad50767
... ... @@ -1,50 +0,0 @@
1   -# -*- coding: utf-8 -*-
2   -# Generated by Django 1.10 on 2016-09-20 21:15
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   - ]
core/migrations/0002_auto_20160920_2352.py
View file @ad50767
... ... @@ -1,50 +0,0 @@
1   -# -*- coding: utf-8 -*-
2   -# Generated by Django 1.10 on 2016-09-21 02:52
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   - ]
courses/migrations/0001_initial.py
  Diff comments   View file @b3beb79
1 1 # -*- coding: utf-8 -*-
2   -# Generated by Django 1.10 on 2016-09-21 02:52
  2 +# Generated by Django 1.10 on 2016-09-22 05:46
3 3 from __future__ import unicode_literals
4 4  
5 5 import autoslug.fields
  6 +from django.conf import settings
6 7 from django.db import migrations, models
7 8 import django.db.models.deletion
8 9  
... ... @@ -12,6 +13,7 @@ class Migration(migrations.Migration):
12 13 initial = True
13 14  
14 15 dependencies = [
  16 + migrations.swappable_dependency(settings.AUTH_USER_MODEL),
15 17 ('core', '0001_initial'),
16 18 ]
17 19  
... ... @@ -22,6 +24,7 @@ class Migration(migrations.Migration):
22 24 ('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')),
23 25 ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')),
24 26 ('limit_date', models.DateTimeField(verbose_name='Deliver Date')),
  27 + ('student', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='student')),
25 28 ],
26 29 bases=('core.resource',),
27 30 ),
... ... @@ -53,17 +56,14 @@ class Migration(migrations.Migration):
53 56 ('init_date', models.DateField(verbose_name='Begin of Course Date')),
54 57 ('end_date', models.DateField(verbose_name='End of Course Date')),
55 58 ('image', models.ImageField(blank=True, upload_to='courses/', verbose_name='Image')),
  59 + ('category', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Category', verbose_name='Category')),
  60 + ('professors', models.ManyToManyField(related_name='courses', to=settings.AUTH_USER_MODEL, verbose_name='Professors')),
  61 + ('students', models.ManyToManyField(related_name='courses_student', to=settings.AUTH_USER_MODEL, verbose_name='Students')),
56 62 ],
57 63 options={
58   -<<<<<<< HEAD
59   - 'ordering': ('create_date', 'name'),
60   - 'verbose_name': 'Course',
61   - 'verbose_name_plural': 'Courses',
62   -=======
63 64 'verbose_name_plural': 'Courses',
64   - 'verbose_name': 'Course',
65 65 'ordering': ('create_date', 'name'),
66   ->>>>>>> 21b49d36360d4f362742aa6527193cb3e0270c36
  66 + 'verbose_name': 'Course',
67 67 },
68 68 ),
69 69 migrations.CreateModel(
... ... @@ -71,6 +71,7 @@ class Migration(migrations.Migration):
71 71 fields=[
72 72 ('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')),
73 73 ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')),
  74 + ('student', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='student')),
74 75 ],
75 76 bases=('core.resource',),
76 77 ),
... ... @@ -86,17 +87,13 @@ class Migration(migrations.Migration):
86 87 ('end_date', models.DateField(verbose_name='End of Subject Date')),
87 88 ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')),
88 89 ('update_date', models.DateTimeField(auto_now=True, verbose_name='Date of last update')),
  90 + ('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='subjects', to='courses.Course', verbose_name='Course')),
  91 + ('professors', models.ManyToManyField(related_name='subjects', to=settings.AUTH_USER_MODEL, verbose_name='Professors')),
89 92 ],
90 93 options={
91   -<<<<<<< HEAD
92   - 'ordering': ('create_date', 'name'),
93   - 'verbose_name': 'Subject',
94 94 'verbose_name_plural': 'Subjects',
95   -=======
96   - 'verbose_name_plural': 'Subjects',
97   - 'verbose_name': 'Subject',
98 95 'ordering': ('create_date', 'name'),
99   ->>>>>>> 21b49d36360d4f362742aa6527193cb3e0270c36
  96 + 'verbose_name': 'Subject',
100 97 },
101 98 ),
102 99 migrations.CreateModel(
... ... @@ -109,17 +106,23 @@ class Migration(migrations.Migration):
109 106 ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')),
110 107 ('update_date', models.DateTimeField(auto_now=True, verbose_name='Date of last update')),
111 108 ('visible', models.BooleanField(default=False, verbose_name='Visible')),
  109 + ('owner', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Owner')),
  110 + ('subject', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Subject', verbose_name='Subject')),
112 111 ],
113 112 options={
114   -<<<<<<< HEAD
115   - 'ordering': ('create_date', 'name'),
116   - 'verbose_name': 'Topic',
117   - 'verbose_name_plural': 'Topics',
118   -=======
119 113 'verbose_name_plural': 'Topics',
120   - 'verbose_name': 'Topic',
121 114 'ordering': ('create_date', 'name'),
122   ->>>>>>> 21b49d36360d4f362742aa6527193cb3e0270c36
  115 + 'verbose_name': 'Topic',
123 116 },
124 117 ),
  118 + migrations.AddField(
  119 + model_name='material',
  120 + name='topic',
  121 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Topic', verbose_name='Topic'),
  122 + ),
  123 + migrations.AddField(
  124 + model_name='activity',
  125 + name='topic',
  126 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Topic', verbose_name='Topic'),
  127 + ),
125 128 ]
... ...
courses/migrations/0002_auto_20160920_1815.py
View file @ad50767
... ... @@ -1,75 +0,0 @@
1   -# -*- coding: utf-8 -*-
2   -# Generated by Django 1.10 on 2016-09-20 21:15
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='subject',
32   - name='course',
33   - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='subjects', to='courses.Course', verbose_name='Course'),
34   - ),
35   - migrations.AddField(
36   - model_name='subject',
37   - name='professors',
38   - field=models.ManyToManyField(related_name='subjects', to=settings.AUTH_USER_MODEL, verbose_name='Professors'),
39   - ),
40   - migrations.AddField(
41   - model_name='material',
42   - name='student',
43   - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='student'),
44   - ),
45   - migrations.AddField(
46   - model_name='material',
47   - name='topic',
48   - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Topic', verbose_name='Topic'),
49   - ),
50   - migrations.AddField(
51   - model_name='course',
52   - name='category',
53   - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Category', verbose_name='Category'),
54   - ),
55   - migrations.AddField(
56   - model_name='course',
57   - name='professors',
58   - field=models.ManyToManyField(related_name='courses', to=settings.AUTH_USER_MODEL, verbose_name='Professors'),
59   - ),
60   - migrations.AddField(
61   - model_name='course',
62   - name='students',
63   - field=models.ManyToManyField(related_name='courses_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
64   - ),
65   - migrations.AddField(
66   - model_name='activity',
67   - name='student',
68   - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='student'),
69   - ),
70   - migrations.AddField(
71   - model_name='activity',
72   - name='topic',
73   - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Topic', verbose_name='Topic'),
74   - ),
75   - ]
courses/migrations/0002_auto_20160920_2352.py
View file @ad50767
... ... @@ -1,75 +0,0 @@
1   -# -*- coding: utf-8 -*-
2   -# Generated by Django 1.10 on 2016-09-21 02:52
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='subject',
32   - name='course',
33   - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='subjects', to='courses.Course', verbose_name='Course'),
34   - ),
35   - migrations.AddField(
36   - model_name='subject',
37   - name='professors',
38   - field=models.ManyToManyField(related_name='subjects', to=settings.AUTH_USER_MODEL, verbose_name='Professors'),
39   - ),
40   - migrations.AddField(
41   - model_name='material',
42   - name='student',
43   - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='student'),
44   - ),
45   - migrations.AddField(
46   - model_name='material',
47   - name='topic',
48   - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Topic', verbose_name='Topic'),
49   - ),
50   - migrations.AddField(
51   - model_name='course',
52   - name='category',
53   - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Category', verbose_name='Category'),
54   - ),
55   - migrations.AddField(
56   - model_name='course',
57   - name='professors',
58   - field=models.ManyToManyField(related_name='courses', to=settings.AUTH_USER_MODEL, verbose_name='Professors'),
59   - ),
60   - migrations.AddField(
61   - model_name='course',
62   - name='students',
63   - field=models.ManyToManyField(related_name='courses_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
64   - ),
65   - migrations.AddField(
66   - model_name='activity',
67   - name='student',
68   - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='student'),
69   - ),
70   - migrations.AddField(
71   - model_name='activity',
72   - name='topic',
73   - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Topic', verbose_name='Topic'),
74   - ),
75   - ]