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

Prevent import failure on CMS

Browse Source
This commit is contained in:
Dave St.Germain
2019-06-10 10:49:06 -04:00
parent a914faf11c
commit 23ab20a6fd
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cms/envs/common.py
View File

@@ -1127,8 +1127,6 @@ INSTALLED_APPS = [
'survey.apps.SurveyConfig', 'survey.apps.SurveyConfig',
'lms.djangoapps.verify_student.apps.VerifyStudentConfig', 'lms.djangoapps.verify_student.apps.VerifyStudentConfig',
'completion', 'completion',
# Reference we couldn't get simple_history dependencies working in any other way. Leaving it
'lms.djangoapps.grades.apps.GradesConfig',
# Microsite configuration application # Microsite configuration application
'microsite_configuration', 'microsite_configuration',

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

@@ -14,6 +14,7 @@ from base64 import b64encode
from collections import defaultdict, namedtuple from collections import defaultdict, namedtuple
from hashlib import sha1 from hashlib import sha1
from django.apps import apps
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.db import models from django.db import models
from django.utils.timezone import now from django.utils.timezone import now
@@ -653,7 +654,12 @@ class PersistentSubsectionGradeOverride(models.Model):
possible_graded_override = models.FloatField(null=True, blank=True) possible_graded_override = models.FloatField(null=True, blank=True)
_CACHE_NAMESPACE = u"grades.models.PersistentSubsectionGradeOverride" _CACHE_NAMESPACE = u"grades.models.PersistentSubsectionGradeOverride"
history = HistoricalRecords()
# This is necessary because CMS does not install the grades app, but it
# imports this models code. Simple History will attempt to connect to the installed
# model in the grades app, which will fail.
if 'grades' in apps.app_configs:
history = HistoricalRecords()
def __unicode__(self): def __unicode__(self):
return u', '.join([ return u', '.join([