Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BOM-933: Fix type mismatches in various migrations 4 (#22146)

Browse Source 
* fix type mismatch in course_goals  migrations

* fix type mismatch in experiments  migrations

* fix type mismatch in xblock_django  migrations

* fix type mismatch in catalog  migrations

* fix type mismatch in static_replace  migrations

* fix type mismatch in bulk_email  migrations

* fix type mismatch in course_overviews migrations
This commit is contained in:
Manjinder Singh
2019-10-24 13:47:51 -04:00
committed by GitHub
parent 05e9e56d56
commit 7f3045cf75
25 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
openedx/core/djangoapps/content/course_overviews/migrations/0004_courseoverview_org.py
View File

@@ -14,6 +14,6 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='courseoverview',
name='org',
field=models.TextField(default=b'outdated_entry', max_length=255),
field=models.TextField(default=u'outdated_entry', max_length=255),
),
]

4
openedx/core/djangoapps/content/course_overviews/migrations/0006_courseoverviewimageset.py
View File

@@ -19,8 +19,8 @@ class Migration(migrations.Migration):
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('created', model_utils.fields.AutoCreatedField(default=django.utils.timezone.now, verbose_name='created', editable=False)),
('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, verbose_name='modified', editable=False)),
('small_url', models.TextField(default=b'', blank=True)),
('large_url', models.TextField(default=b'', blank=True)),
('small_url', models.TextField(default=u'', blank=True)),
('large_url', models.TextField(default=u'', blank=True)),
('course_overview', models.OneToOneField(related_name='image_set', to='course_overviews.CourseOverview', on_delete=models.CASCADE)),
],
options={

2
openedx/core/djangoapps/content/course_overviews/migrations/0015_historicalcourseoverview.py
View File

@@ -27,7 +27,7 @@ class Migration(migrations.Migration):
('version', models.IntegerField()),
('id', opaque_keys.edx.django.models.CourseKeyField(db_index=True, max_length=255)),
('_location', opaque_keys.edx.django.models.UsageKeyField(max_length=255)),
('org', models.TextField(default=b'outdated_entry', max_length=255)),
('org', models.TextField(default=u'outdated_entry', max_length=255)),
('display_name', models.TextField(null=True)),
('display_number_with_default', models.TextField()),
('display_org_with_default', models.TextField()),

2
openedx/core/djangoapps/content/course_overviews/migrations/0016_simulatecoursepublishconfig.py
View File

@@ -21,7 +21,7 @@ class Migration(migrations.Migration):
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('change_date', models.DateTimeField(auto_now_add=True, verbose_name='Change date')),
('enabled', models.BooleanField(default=False, verbose_name='Enabled')),
('arguments', models.TextField(blank=True, default=b'', help_text=b'Useful for manually running a Jenkins job. Specify like "--delay 10 --listeners A B C --courses X Y Z".')),
('arguments', models.TextField(blank=True, default=u'', help_text=u'Useful for manually running a Jenkins job. Specify like "--delay 10 --listeners A B C --courses X Y Z".')),
('changed_by', models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL, verbose_name='Changed by')),
],
options={

2
openedx/core/djangoapps/content/course_overviews/migrations/0017_auto_20191002_0823.py
View File

@@ -15,6 +15,6 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='simulatecoursepublishconfig',
name='arguments',
field=models.TextField(blank=True, default=b'', help_text=b'Useful for manually running a Jenkins job. Specify like "--delay 10 --receivers A B C --courses X Y Z".'),
field=models.TextField(blank=True, default=u'', help_text=u'Useful for manually running a Jenkins job. Specify like "--delay 10 --receivers A B C --courses X Y Z".'),
),
]

10
openedx/core/djangoapps/content/course_overviews/models.py
View File

@@ -61,7 +61,7 @@ class CourseOverview(TimeStampedModel):
# Course identification
id = CourseKeyField(db_index=True, primary_key=True, max_length=255)
_location = UsageKeyField(max_length=255)
org = TextField(max_length=255, default='outdated_entry')
org = TextField(max_length=255, default=u'outdated_entry')
display_name = TextField(null=True)
display_number_with_default = TextField()
display_org_with_default = TextField()
@@ -815,8 +815,8 @@ class CourseOverviewImageSet(TimeStampedModel):
"""
course_overview = models.OneToOneField(CourseOverview, db_index=True, related_name="image_set",
on_delete=models.CASCADE)
small_url = models.TextField(blank=True, default="")
large_url = models.TextField(blank=True, default="")
small_url = models.TextField(blank=True, default=u"")
large_url = models.TextField(blank=True, default=u"")
@classmethod
def create(cls, course_overview, course=None):
@@ -935,9 +935,9 @@ class SimulateCoursePublishConfig(ConfigurationModel):
arguments = models.TextField(
blank=True,
help_text='Useful for manually running a Jenkins job. Specify like "--delay 10 --receivers A B C \
help_text=u'Useful for manually running a Jenkins job. Specify like "--delay 10 --receivers A B C \
--courses X Y Z".',
default='',
default=u'',
)
def __str__(self):