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

Merge pull request #3757 from edx/sarina/fix-git_import

Browse Source 
Sarina/fix git import
This commit is contained in:
Sarina Canelake
2014-05-16 16:12:33 -04:00
parent 56a6b99f61 b3462d1c67
commit afac5145e3
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/djangoapps/courseware/module_render.py
View File

@@ -503,7 +503,7 @@ def get_module_system_for_user(user, field_data_cache,
if settings.FEATURES.get('ENABLE_PSYCHOMETRICS'): if settings.FEATURES.get('ENABLE_PSYCHOMETRICS'):
system.set( system.set(
'psychometrics_handler', # set callback for updating PsychometricsData 'psychometrics_handler', # set callback for updating PsychometricsData
make_psychometrics_data_update_handler(course_id, user, descriptor.location.to_deprecated_string()) make_psychometrics_data_update_handler(course_id, user, descriptor.location)
) )
system.set(u'user_is_staff', has_access(user, u'staff', descriptor.location, course_id)) system.set(u'user_is_staff', has_access(user, u'staff', descriptor.location, course_id))

7
lms/djangoapps/dashboard/git_import.py
View File

@@ -17,7 +17,9 @@ from django.utils.translation import ugettext as _
import mongoengine import mongoengine
from dashboard.models import CourseImportLog from dashboard.models import CourseImportLog
from opaque_keys import InvalidKeyError
from xmodule.modulestore.keys import CourseKey from xmodule.modulestore.keys import CourseKey
from xmodule.modulestore.locations import SlashSeparatedCourseKey
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
@@ -230,7 +232,10 @@ def add_repo(repo, rdir_in, branch=None):
match = re.search(r'(?ms)===> IMPORTING course (\S+)', ret_import) match = re.search(r'(?ms)===> IMPORTING course (\S+)', ret_import)
if match: if match:
course_id = match.group(1) course_id = match.group(1)
course_key = CourseKey.from_string(course_id) try:
course_key = CourseKey.from_string(course_id)
except InvalidKeyError:
course_key = SlashSeparatedCourseKey.from_deprecated_string(course_id)
cdir = '{0}/{1}'.format(GIT_REPO_DIR, course_key.course) cdir = '{0}/{1}'.format(GIT_REPO_DIR, course_key.course)
log.debug('Studio course dir = {0}'.format(cdir)) log.debug('Studio course dir = {0}'.format(cdir))

2
lms/djangoapps/psychometrics/psychoanalyze.py
View File

@@ -307,7 +307,7 @@ def make_psychometrics_data_update_handler(course_id, user, module_state_key):
the PsychometricData instance for the given StudentModule instance. the PsychometricData instance for the given StudentModule instance.
""" """
sm, status = StudentModule.objects.get_or_create( sm, status = StudentModule.objects.get_or_create(
course_id=course_id.to_deprecated_string(), course_id=course_id,
student=user, student=user,
module_state_key=module_state_key, module_state_key=module_state_key,
defaults={'state': '{}', 'module_type': 'problem'}, defaults={'state': '{}', 'module_type': 'problem'},