Download as
Browse Code »

Commit c2d5941d4b065f732807839dbe1aa2400ff86aca

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

Fixing migration errors

Showing 10 changed files with 610 additions and 45 deletions   Show diff stats
app/locale/he_il/LC_MESSAGES/django.po 0 → 100644
  Diff comments   View file @c2d5941
... ... @@ -0,0 +1,178 @@
  1 +# SOME DESCRIPTIVE TITLE.
  2 +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
  3 +# This file is distributed under the same license as the PACKAGE package.
  4 +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
  5 +#
  6 +#, fuzzy
  7 +msgid ""
  8 +msgstr ""
  9 +"Project-Id-Version: PACKAGE VERSION\n"
  10 +"Report-Msgid-Bugs-To: \n"
  11 +"POT-Creation-Date: 2016-09-16 02:41-0300\n"
  12 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  13 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  14 +"Language-Team: LANGUAGE <LL@li.org>\n"
  15 +"Language: \n"
  16 +"MIME-Version: 1.0\n"
  17 +"Content-Type: text/plain; charset=UTF-8\n"
  18 +"Content-Transfer-Encoding: 8bit\n"
  19 +
  20 +#: app/templates/app/base.html:10
  21 +msgid "The Project"
  22 +msgstr ""
  23 +
  24 +#: app/templates/app/base.html:11
  25 +msgid "CCTE Group"
  26 +msgstr ""
  27 +
  28 +#: app/templates/app/base.html:14
  29 +msgid "Hi"
  30 +msgstr ""
  31 +
  32 +#: app/templates/app/base.html:16
  33 +msgid "See Profile"
  34 +msgstr ""
  35 +
  36 +#: app/templates/app/base.html:17
  37 +msgid "Settings"
  38 +msgstr ""
  39 +
  40 +#: app/templates/app/base.html:18
  41 +msgid "Logout"
  42 +msgstr ""
  43 +
  44 +#: app/templates/app/index.html:6
  45 +msgid "You have:"
  46 +msgstr ""
  47 +
  48 +#: app/templates/app/index.html:10 app/templates/home.html:88
  49 +msgid "Pending Tasks"
  50 +msgstr ""
  51 +
  52 +#: app/templates/app/index.html:14
  53 +msgid "Users Online"
  54 +msgstr ""
  55 +
  56 +#: app/templates/app/index.html:20
  57 +msgid "You can:"
  58 +msgstr ""
  59 +
  60 +#: app/templates/app/index.html:24 app/templates/home_professor.html:25
  61 +msgid "Create Course"
  62 +msgstr ""
  63 +
  64 +#: app/templates/app/index.html:29 app/templates/home.html:93
  65 +msgid "Manage Users"
  66 +msgstr ""
  67 +
  68 +#: app/templates/app/index.html:33 app/templates/home.html:96
  69 +msgid "Manage Courses"
  70 +msgstr ""
  71 +
  72 +#: app/templates/app/index.html:37
  73 +msgid "Gerenciar Categorias"
  74 +msgstr ""
  75 +
  76 +#: app/templates/app/index.html:45
  77 +msgid "Your course(s):"
  78 +msgstr ""
  79 +
  80 +#: app/templates/app/index.html:46
  81 +msgid "No courses subscribed yet"
  82 +msgstr ""
  83 +
  84 +#: app/templates/app/index.html:56
  85 +msgid "Search course:"
  86 +msgstr ""
  87 +
  88 +#: app/templates/app/index.html:62
  89 +msgid "Search"
  90 +msgstr ""
  91 +
  92 +#: app/templates/app/index.html:67
  93 +msgid "Most popular keywords:"
  94 +msgstr ""
  95 +
  96 +#: app/templates/home.html:86
  97 +msgid "Home"
  98 +msgstr ""
  99 +
  100 +#: app/templates/home.html:87 app/templates/home_student.html:25
  101 +msgid "Profile"
  102 +msgstr ""
  103 +
  104 +#: app/templates/home.html:90
  105 +msgid "My courses"
  106 +msgstr ""
  107 +
  108 +#: app/templates/home.html:105 app/templates/home_professor.html:33
  109 +msgid "Courses"
  110 +msgstr ""
  111 +
  112 +#: app/templates/home.html:131
  113 +msgid "No pending tasks at the moment."
  114 +msgstr ""
  115 +
  116 +#: app/templates/home_admin_content.html:10
  117 +msgid "Students"
  118 +msgstr ""
  119 +
  120 +#: app/templates/home_admin_content.html:11
  121 +msgid "Beginning"
  122 +msgstr ""
  123 +
  124 +#: app/templates/home_admin_content.html:12
  125 +msgid "End"
  126 +msgstr ""
  127 +
  128 +#: app/templates/home_admin_content.html:15
  129 +msgid "Edit"
  130 +msgstr ""
  131 +
  132 +#: app/templates/home_professor.html:20 app/templates/home_student.html:21
  133 +msgid "Menu"
  134 +msgstr ""
  135 +
  136 +#: app/templates/home_professor.html:24
  137 +msgid "Pending tasks"
  138 +msgstr ""
  139 +
  140 +#: app/templates/home_professor.html:26
  141 +msgid "Manage Course"
  142 +msgstr ""
  143 +
  144 +#: app/templates/home_professor.html:43
  145 +msgid "Students:"
  146 +msgstr ""
  147 +
  148 +#: app/templates/home_professor.html:44
  149 +msgid "Beginning:"
  150 +msgstr ""
  151 +
  152 +#: app/templates/home_professor.html:45
  153 +msgid "End:"
  154 +msgstr ""
  155 +
  156 +#: app/templates/home_professor.html:52
  157 +msgid "You didn't create any course yet."
  158 +msgstr ""
  159 +
  160 +#: app/templates/home_professor.html:58 app/templates/home_student.html:73
  161 +msgid "Goals"
  162 +msgstr ""
  163 +
  164 +#: app/templates/home_student.html:26
  165 +msgid "My Courses"
  166 +msgstr ""
  167 +
  168 +#: app/templates/home_student.html:27
  169 +msgid "Google accounts"
  170 +msgstr ""
  171 +
  172 +#: app/templates/home_student.html:34
  173 +msgid "Notifications"
  174 +msgstr ""
  175 +
  176 +#: app/templates/home_student.html:76
  177 +msgid "Favorites"
  178 +msgstr ""
... ...
core/locale/he_il/LC_MESSAGES/django.po 0 → 100644
  Diff comments   View file @c2d5941
... ... @@ -0,0 +1,66 @@
  1 +# SOME DESCRIPTIVE TITLE.
  2 +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
  3 +# This file is distributed under the same license as the PACKAGE package.
  4 +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
  5 +#
  6 +#, fuzzy
  7 +msgid ""
  8 +msgstr ""
  9 +"Project-Id-Version: PACKAGE VERSION\n"
  10 +"Report-Msgid-Bugs-To: \n"
  11 +"POT-Creation-Date: 2016-09-16 02:41-0300\n"
  12 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  13 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  14 +"Language-Team: LANGUAGE <LL@li.org>\n"
  15 +"Language: \n"
  16 +"MIME-Version: 1.0\n"
  17 +"Content-Type: text/plain; charset=UTF-8\n"
  18 +"Content-Transfer-Encoding: 8bit\n"
  19 +
  20 +#: core/templates/base.html:97
  21 +msgid "Log out"
  22 +msgstr ""
  23 +
  24 +#: core/templates/index.html:38
  25 +msgid "Username"
  26 +msgstr ""
  27 +
  28 +#: core/templates/index.html:44
  29 +msgid "Password"
  30 +msgstr ""
  31 +
  32 +#: core/templates/index.html:52
  33 +msgid "Remember Email"
  34 +msgstr ""
  35 +
  36 +#: core/templates/index.html:61
  37 +msgid "Guest"
  38 +msgstr ""
  39 +
  40 +#: core/templates/index.html:64 core/templates/register_user.html:71
  41 +msgid "Login"
  42 +msgstr ""
  43 +
  44 +#: core/templates/index.html:73
  45 +msgid "Sign Up"
  46 +msgstr ""
  47 +
  48 +#: core/templates/register_user.html:29
  49 +msgid "User Register"
  50 +msgstr ""
  51 +
  52 +#: core/templates/register_user.html:68
  53 +msgid "Save"
  54 +msgstr ""
  55 +
  56 +#: core/templates/remember_password.html:27
  57 +msgid "E-mail"
  58 +msgstr ""
  59 +
  60 +#: core/templates/remember_password.html:31
  61 +msgid "Registration"
  62 +msgstr ""
  63 +
  64 +#: core/templates/remember_password.html:35
  65 +msgid "Send"
  66 +msgstr ""
... ...
core/migrations/0001_initial.py
  Diff comments   View file @c2d5941
1 1 # -*- coding: utf-8 -*-
2   -# Generated by Django 1.10 on 2016-09-20 13:57
  2 +# Generated by Django 1.10 on 2016-09-21 02:52
3 3 from __future__ import unicode_literals
4 4  
5 5 import autoslug.fields
6   -from django.conf import settings
7 6 from django.db import migrations, models
8 7 import django.db.models.deletion
9 8  
... ... @@ -13,7 +12,6 @@ class Migration(migrations.Migration):
13 12 initial = True
14 13  
15 14 dependencies = [
16   - migrations.swappable_dependency(settings.AUTH_USER_MODEL),
17 15 ]
18 16  
19 17 operations = [
... ... @@ -25,19 +23,18 @@ class Migration(migrations.Migration):
25 23 ('created_date', models.DateField(auto_now_add=True, verbose_name='Created Date')),
26 24 ],
27 25 options={
28   - 'verbose_name_plural': 'Actions',
29 26 'verbose_name': 'Action',
  27 + 'verbose_name_plural': 'Actions',
30 28 },
31 29 ),
32 30 migrations.CreateModel(
33 31 name='Action_Resource',
34 32 fields=[
35 33 ('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')),
37 34 ],
38 35 options={
39   - 'verbose_name_plural': 'Action_Resources',
40 36 'verbose_name': 'Action_Resource',
  37 + 'verbose_name_plural': 'Action_Resources',
41 38 },
42 39 ),
43 40 migrations.CreateModel(
... ... @@ -45,12 +42,10 @@ class Migration(migrations.Migration):
45 42 fields=[
46 43 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
47 44 ('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')),
50 45 ],
51 46 options={
52   - 'verbose_name_plural': 'Logs',
53 47 'verbose_name': 'Log',
  48 + 'verbose_name_plural': 'Logs',
54 49 },
55 50 ),
56 51 migrations.CreateModel(
... ... @@ -61,12 +56,10 @@ class Migration(migrations.Migration):
61 56 ('read', models.BooleanField(default=False, verbose_name='Read')),
62 57 ('datetime', models.DateTimeField(auto_now_add=True, verbose_name='Date and Time of action')),
63 58 ('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')),
66 59 ],
67 60 options={
68   - 'verbose_name_plural': 'Notifications',
69 61 'verbose_name': 'Notification',
  62 + 'verbose_name_plural': 'Notifications',
70 63 },
71 64 ),
72 65 migrations.CreateModel(
... ... @@ -79,13 +72,8 @@ class Migration(migrations.Migration):
79 72 ('url', models.CharField(default='', max_length=100, verbose_name='URL')),
80 73 ],
81 74 options={
82   - 'verbose_name_plural': 'Resources',
83 75 'verbose_name': 'Resource',
  76 + 'verbose_name_plural': 'Resources',
84 77 },
85 78 ),
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   - ),
91 79 ]
... ...
core/migrations/0002_auto_20160920_2352.py 0 → 100644
  Diff comments   View file @c2d5941
... ... @@ -0,0 +1,50 @@
  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/locale/he_il/LC_MESSAGES/django.po 0 → 100644
  Diff comments   View file @c2d5941
... ... @@ -0,0 +1,229 @@
  1 +# SOME DESCRIPTIVE TITLE.
  2 +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
  3 +# This file is distributed under the same license as the PACKAGE package.
  4 +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
  5 +#
  6 +#, fuzzy
  7 +msgid ""
  8 +msgstr ""
  9 +"Project-Id-Version: PACKAGE VERSION\n"
  10 +"Report-Msgid-Bugs-To: \n"
  11 +"POT-Creation-Date: 2016-09-16 02:41-0300\n"
  12 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  13 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  14 +"Language-Team: LANGUAGE <LL@li.org>\n"
  15 +"Language: \n"
  16 +"MIME-Version: 1.0\n"
  17 +"Content-Type: text/plain; charset=UTF-8\n"
  18 +"Content-Transfer-Encoding: 8bit\n"
  19 +
  20 +#: courses/templates/category/create.html:8
  21 +#: courses/templates/category/delete.html:7
  22 +#: courses/templates/category/index.html:7
  23 +#: courses/templates/category/update.html:8
  24 +#: courses/templates/category/view.html:7
  25 +#: courses/templates/course/create.html:8
  26 +#: courses/templates/course/delete.html:7 courses/templates/course/home.html:8
  27 +#: courses/templates/course/update.html:8
  28 +#: courses/templates/course/view.html:39
  29 +#: courses/templates/subject/index.html:8
  30 +msgid "Home"
  31 +msgstr ""
  32 +
  33 +#: courses/templates/category/create.html:9
  34 +#: courses/templates/category/delete.html:18
  35 +#: courses/templates/category/index.html:18
  36 +#: courses/templates/category/view.html:18
  37 +msgid "Create Category"
  38 +msgstr ""
  39 +
  40 +#: courses/templates/category/create.html:16
  41 +#: courses/templates/category/delete.html:15
  42 +#: courses/templates/category/index.html:15
  43 +#: courses/templates/category/update.html:16
  44 +#: courses/templates/category/view.html:15
  45 +msgid "Categories"
  46 +msgstr ""
  47 +
  48 +#: courses/templates/category/create.html:26
  49 +#: courses/templates/category/update.html:26
  50 +#: courses/templates/course/create.html:26
  51 +#: courses/templates/course/update.html:32
  52 +msgid "All fields are required"
  53 +msgstr ""
  54 +
  55 +#: courses/templates/category/create.html:51
  56 +#: courses/templates/category/update.html:51
  57 +#: courses/templates/course/create.html:51
  58 +#: courses/templates/course/update.html:57
  59 +msgid "Save"
  60 +msgstr ""
  61 +
  62 +#: courses/templates/category/delete.html:8
  63 +#: courses/templates/category/index.html:8
  64 +msgid "Manage Categories"
  65 +msgstr ""
  66 +
  67 +#: courses/templates/category/delete.html:26
  68 +#: courses/templates/subject/delete.html:11
  69 +msgid "Are you sure you want to delete the category"
  70 +msgstr ""
  71 +
  72 +#: courses/templates/category/delete.html:27
  73 +#: courses/templates/course/delete.html:28
  74 +#: courses/templates/subject/delete.html:12
  75 +msgid "Yes"
  76 +msgstr ""
  77 +
  78 +#: courses/templates/category/delete.html:28
  79 +#: courses/templates/course/delete.html:29
  80 +#: courses/templates/subject/delete.html:13
  81 +msgid "No"
  82 +msgstr ""
  83 +
  84 +#: courses/templates/category/index.html:38
  85 +msgid "Name"
  86 +msgstr ""
  87 +
  88 +#: courses/templates/category/index.html:39
  89 +msgid "Slug"
  90 +msgstr ""
  91 +
  92 +#: courses/templates/category/index.html:40
  93 +msgid "Actions"
  94 +msgstr ""
  95 +
  96 +#: courses/templates/category/index.html:59
  97 +msgid "No categories found"
  98 +msgstr ""
  99 +
  100 +#: courses/templates/category/update.html:9
  101 +#: courses/templates/category/view.html:21
  102 +msgid "Edit Category"
  103 +msgstr ""
  104 +
  105 +#: courses/templates/category/view.html:24
  106 +msgid "Remove Category"
  107 +msgstr ""
  108 +
  109 +#: courses/templates/category/view.html:32
  110 +msgid "Name:"
  111 +msgstr ""
  112 +
  113 +#: courses/templates/category/view.html:33
  114 +msgid "Slug:"
  115 +msgstr ""
  116 +
  117 +#: courses/templates/course/create.html:9
  118 +#: courses/templates/course/delete.html:18
  119 +#: courses/templates/course/filtered.html:11
  120 +#: courses/templates/course/index.html:19
  121 +msgid "Create Course"
  122 +msgstr ""
  123 +
  124 +#: courses/templates/course/create.html:16
  125 +#: courses/templates/course/delete.html:15
  126 +#: courses/templates/course/filtered.html:8
  127 +#: courses/templates/course/home.html:16
  128 +#: courses/templates/course/index.html:16
  129 +#: courses/templates/course/update.html:16
  130 +#: courses/templates/course/view.html:48
  131 +msgid "Courses"
  132 +msgstr ""
  133 +
  134 +#: courses/templates/course/delete.html:27
  135 +msgid "Are you sure you want to delete the couse"
  136 +msgstr ""
  137 +
  138 +#: courses/templates/course/filtered.html:19
  139 +#: courses/templates/course/index.html:27
  140 +msgid "Categories:"
  141 +msgstr ""
  142 +
  143 +#: courses/templates/course/home.html:9
  144 +msgid "Home Course"
  145 +msgstr ""
  146 +
  147 +#: courses/templates/course/index.html:81
  148 +msgid "students tops"
  149 +msgstr ""
  150 +
  151 +#: courses/templates/course/index.html:87
  152 +msgid "Subscribe Period:"
  153 +msgstr ""
  154 +
  155 +#: courses/templates/course/index.html:89
  156 +msgid "Period:"
  157 +msgstr ""
  158 +
  159 +#: courses/templates/course/index.html:105
  160 +msgid "No courses found"
  161 +msgstr ""
  162 +
  163 +#: courses/templates/course/update.html:9
  164 +msgid "Edit Course"
  165 +msgstr ""
  166 +
  167 +#: courses/templates/course/update.html:19
  168 +msgid "Manage Modules"
  169 +msgstr ""
  170 +
  171 +#: courses/templates/course/update.html:22
  172 +msgid "Participants"
  173 +msgstr ""
  174 +
  175 +#: courses/templates/course/view.html:40
  176 +msgid "Profile"
  177 +msgstr ""
  178 +
  179 +#: courses/templates/course/view.html:62
  180 +msgid "Subjects"
  181 +msgstr ""
  182 +
  183 +#: courses/templates/course/view.html:85
  184 +msgid "Professor"
  185 +msgstr ""
  186 +
  187 +#: courses/templates/course/view.html:88
  188 +msgid "Description"
  189 +msgstr ""
  190 +
  191 +#: courses/templates/course/view.html:110
  192 +#: courses/templates/subject/index.html:78
  193 +msgid "Pending Stuffs"
  194 +msgstr ""
  195 +
  196 +#: courses/templates/course/view.html:113
  197 +msgid "No pending tasks at the moment."
  198 +msgstr ""
  199 +
  200 +#: courses/templates/subject/create.html:20
  201 +#: courses/templates/topic/create.html:20
  202 +msgid "Create"
  203 +msgstr ""
  204 +
  205 +#: courses/templates/subject/form_view_teacher.html:10
  206 +#: courses/templates/subject/index.html:47
  207 +msgid "edit"
  208 +msgstr ""
  209 +
  210 +#: courses/templates/subject/index.html:10
  211 +msgid "Manage Subjects"
  212 +msgstr ""
  213 +
  214 +#: courses/templates/subject/index.html:34
  215 +msgid "Create Subject"
  216 +msgstr ""
  217 +
  218 +#: courses/templates/subject/index.html:52
  219 +msgid "delete"
  220 +msgstr ""
  221 +
  222 +#: courses/templates/subject/index.html:71
  223 +msgid "Create Topic"
  224 +msgstr ""
  225 +
  226 +#: courses/templates/subject/update.html:20
  227 +#: courses/templates/topic/update.html:20
  228 +msgid "Update"
  229 +msgstr ""
... ...
courses/migrations/0001_initial.py
  Diff comments   View file @c2d5941
1 1 # -*- coding: utf-8 -*-
2   -# Generated by Django 1.10 on 2016-09-20 13:57
  2 +# Generated by Django 1.10 on 2016-09-21 02:52
3 3 from __future__ import unicode_literals
4 4  
5 5 import autoslug.fields
6   -from django.conf import settings
7 6 from django.db import migrations, models
8 7 import django.db.models.deletion
9 8  
... ... @@ -14,7 +13,6 @@ class Migration(migrations.Migration):
14 13  
15 14 dependencies = [
16 15 ('core', '0001_initial'),
17   - migrations.swappable_dependency(settings.AUTH_USER_MODEL),
18 16 ]
19 17  
20 18 operations = [
... ... @@ -24,7 +22,6 @@ class Migration(migrations.Migration):
24 22 ('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')),
25 23 ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')),
26 24 ('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')),
28 25 ],
29 26 bases=('core.resource',),
30 27 ),
... ... @@ -56,14 +53,11 @@ class Migration(migrations.Migration):
56 53 ('init_date', models.DateField(verbose_name='Begin of Course Date')),
57 54 ('end_date', models.DateField(verbose_name='End of Course Date')),
58 55 ('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')),
62 56 ],
63 57 options={
  58 + 'ordering': ('create_date', 'name'),
64 59 'verbose_name': 'Course',
65 60 'verbose_name_plural': 'Courses',
66   - 'ordering': ('create_date', 'name'),
67 61 },
68 62 ),
69 63 migrations.CreateModel(
... ... @@ -71,7 +65,6 @@ class Migration(migrations.Migration):
71 65 fields=[
72 66 ('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 67 ('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')),
75 68 ],
76 69 bases=('core.resource',),
77 70 ),
... ... @@ -87,13 +80,11 @@ class Migration(migrations.Migration):
87 80 ('end_date', models.DateField(verbose_name='End of Subject Date')),
88 81 ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')),
89 82 ('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')),
92 83 ],
93 84 options={
  85 + 'ordering': ('create_date', 'name'),
94 86 'verbose_name': 'Subject',
95 87 'verbose_name_plural': 'Subjects',
96   - 'ordering': ('create_date', 'name'),
97 88 },
98 89 ),
99 90 migrations.CreateModel(
... ... @@ -106,23 +97,11 @@ class Migration(migrations.Migration):
106 97 ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')),
107 98 ('update_date', models.DateTimeField(auto_now=True, verbose_name='Date of last update')),
108 99 ('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')),
111 100 ],
112 101 options={
  102 + 'ordering': ('create_date', 'name'),
113 103 'verbose_name': 'Topic',
114 104 'verbose_name_plural': 'Topics',
115   - 'ordering': ('create_date', 'name'),
116 105 },
117 106 ),
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   - ),
128 107 ]
... ...
courses/migrations/0002_auto_20160920_2352.py 0 → 100644
  Diff comments   View file @c2d5941
... ... @@ -0,0 +1,75 @@
  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 + ]
... ...
forum/migrations/__init__.py
View file @382dede
users/admin.py
  Diff comments   View file @c2d5941
... ... @@ -5,6 +5,6 @@ from .forms import UserForm
5 5 class UserAdmin(admin.ModelAdmin):
6 6 list_display = ['username', 'name', 'email', 'is_staff', 'is_active']
7 7 search_fields = ['username', 'name', 'email']
8   - form = UserForm
  8 + # form = UserForm
9 9  
10 10 admin.site.register(User, UserAdmin)
11 11 \ No newline at end of file
... ...
users/migrations/0001_initial.py
  Diff comments   View file @c2d5941
1 1 # -*- coding: utf-8 -*-
2   -# Generated by Django 1.10 on 2016-09-20 13:57
  2 +# Generated by Django 1.10 on 2016-09-21 02:52
3 3 from __future__ import unicode_literals
4 4  
5 5 import django.contrib.auth.models
... ...