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

restore metadata inheritance. Fix lms jump computation on the Studio index page. This gets expensive.

Browse Source
This commit is contained in:
Chris Dodge
2013-02-27 22:37:13 -05:00
parent e42cdfbd29
commit 905199b5eb
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cms/djangoapps/contentstore/utils.py
View File

@@ -75,12 +75,15 @@ def get_course_for_item(location):
return courses[0]
def get_lms_link_for_item(location, preview=False):
def get_lms_link_for_item(location, course_id=None, preview=False):
if course_id is None:
course_id = get_course_id(location)
if settings.LMS_BASE is not None:
lms_link = "//{preview}{lms_base}/courses/{course_id}/jump_to/{location}".format(
preview='preview.' if preview else '',
lms_base=settings.LMS_BASE,
course_id=get_course_id(location),
course_id= course_id,
location=Location(location)
)
else:

4
cms/djangoapps/contentstore/views.py
View File

@@ -114,7 +114,7 @@ def index(request):
"""
List all courses available to the logged in user
"""
courses = modulestore().get_items(['i4x', None, None, 'course', None])
courses = modulestore('direct').get_items(['i4x', None, None, 'course', None])
# filter out courses that we don't have access too
def course_filter(course):
@@ -132,7 +132,7 @@ def index(request):
course.location.org,
course.location.course,
course.location.name]),
get_lms_link_for_item(course.location))
get_lms_link_for_item(course.location, course_id=course.location.course_id))
for course in courses],
'user': request.user,
'disable_course_creation': settings.MITX_FEATURES.get('DISABLE_COURSE_CREATION', False) and not request.user.is_staff

5
common/lib/xmodule/xmodule/modulestore/mongo.py
View File

@@ -3,6 +3,7 @@ import sys
import logging
import copy
import time
import traceback
from bson.son import SON
from fs.osfs import OSFS
@@ -289,8 +290,8 @@ class MongoModuleStore(ModuleStoreBase):
# if we are loading a course object, there is no parent to inherit the metadata from
# so don't bother getting it
#if item['location']['category'] != 'course':
# metadata_inheritance_tree = self.get_cached_metadata_inheritance_tree(Location(item['location']), 300)
if item['location']['category'] != 'course':
metadata_inheritance_tree = self.get_cached_metadata_inheritance_tree(Location(item['location']), 300)
# TODO (cdodge): When the 'split module store' work has been completed, we should remove
# the 'metadata_inheritance_tree' parameter