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 (#22112)

Browse Source 
* Fix type mismatches in the course_modes migrations

* Fix type mismatches in the course_action_state migrations

* Fix type mismatches in the schedules migrations

* Fix type mismatches in grades migrations

* Fix type mismatches in video_pipeline

* Fix type mismatches in api_admin

* Fix mismatches in credential migrations
This commit is contained in:
Manjinder Singh
2019-10-24 11:42:39 -04:00
committed by GitHub
parent dc0a6488d5
commit a384e753fd
26 changed files with 61 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/djangoapps/grades/config/models.py
View File

@@ -94,5 +94,5 @@ class ComputeGradesSetting(ConfigurationModel):
batch_size = IntegerField(default=100)
course_ids = TextField(
blank=False,
help_text="Whitespace-separated list of course keys for which to compute grades."
help_text=u"Whitespace-separated list of course keys for which to compute grades."
)

4
lms/djangoapps/grades/constants.py
View File

@@ -13,6 +13,6 @@ class ScoreDatabaseTableEnum(object):
class GradeOverrideFeatureEnum(object):
proctoring = 'PROCTORING'
gradebook = 'GRADEBOOK'
proctoring = u'PROCTORING'
gradebook = u'GRADEBOOK'
grade_import = 'grade-import'

2
lms/djangoapps/grades/migrations/0012_computegradessetting.py
View File

@@ -21,7 +21,7 @@ class Migration(migrations.Migration):
('change_date', models.DateTimeField(auto_now_add=True, verbose_name='Change date')),
('enabled', models.BooleanField(default=False, verbose_name='Enabled')),
('batch_size', models.IntegerField(default=100)),
('course_ids', models.TextField(help_text=b'Whitespace-separated list of course keys for which to compute grades.')),
('course_ids', models.TextField(help_text=u'Whitespace-separated list of course keys for which to compute grades.')),
('changed_by', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, editable=False, to=settings.AUTH_USER_MODEL, null=True, verbose_name='Changed by')),
],
),

4
lms/djangoapps/grades/migrations/0014_persistentsubsectiongradeoverridehistory.py
View File

@@ -20,8 +20,8 @@ class Migration(migrations.Migration):
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('override_id', models.IntegerField(db_index=True)),
('feature', models.CharField(choices=[(b'PROCTORING', b'proctoring'), (b'GRADEBOOK', b'gradebook')], default=b'PROCTORING', max_length=32)),
('action', models.CharField(choices=[(b'CREATEORUPDATE', b'create_or_update'), (b'DELETE', b'delete')], default=b'CREATEORUPDATE', max_length=32)),
('feature', models.CharField(choices=[(u'PROCTORING', u'proctoring'), (u'GRADEBOOK', u'gradebook')], default=u'PROCTORING', max_length=32)),
('action', models.CharField(choices=[(u'CREATEORUPDATE', u'create_or_update'), (u'DELETE', u'delete')], default=u'CREATEORUPDATE', max_length=32)),
('comments', models.CharField(blank=True, max_length=300, null=True)),
('created', models.DateTimeField(auto_now_add=True, db_index=True)),
('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),

12
lms/djangoapps/grades/models.py
View File

@@ -781,15 +781,15 @@ class PersistentSubsectionGradeOverrideHistory(models.Model):
.. no_pii:
"""
OVERRIDE_FEATURES = (
(constants.GradeOverrideFeatureEnum.proctoring, 'proctoring'),
(constants.GradeOverrideFeatureEnum.gradebook, 'gradebook'),
(constants.GradeOverrideFeatureEnum.proctoring, u'proctoring'),
(constants.GradeOverrideFeatureEnum.gradebook, u'gradebook'),
)
CREATE_OR_UPDATE = 'CREATEORUPDATE'
DELETE = 'DELETE'
CREATE_OR_UPDATE = u'CREATEORUPDATE'
DELETE = u'DELETE'
OVERRIDE_ACTIONS = (
(CREATE_OR_UPDATE, 'create_or_update'),
(DELETE, 'delete')
(CREATE_OR_UPDATE, u'create_or_update'),
(DELETE, u'delete')
)
class Meta(object):