Merge pull request #13671 from edx/jeskew/move_xmodule_django_to_openedx_core

Move xmodule_django app to openedx.core.djangoapps
This commit is contained in:
John Eskew
2016-10-06 16:53:25 -04:00
committed by GitHub
65 changed files with 144 additions and 139 deletions

View File

@@ -3,7 +3,7 @@ from __future__ import unicode_literals
from django.db import migrations, models
from django.conf import settings
import xmodule_django.models
from openedx.core.djangoapps.xmodule_django.models import CourseKeyField
class Migration(migrations.Migration):
@@ -18,7 +18,7 @@ class Migration(migrations.Migration):
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('task_type', models.CharField(max_length=50, db_index=True)),
('course_id', xmodule_django.models.CourseKeyField(max_length=255, db_index=True)),
('course_id', CourseKeyField(max_length=255, db_index=True)),
('task_key', models.CharField(max_length=255, db_index=True)),
('task_input', models.CharField(max_length=255)),
('task_id', models.CharField(max_length=255, db_index=True)),

View File

@@ -24,7 +24,7 @@ from django.core.files.base import ContentFile
from django.db import models, transaction
from openedx.core.storage import get_storage
from xmodule_django.models import CourseKeyField
from openedx.core.djangoapps.xmodule_django.models import CourseKeyField
# define custom states used by InstructorTask