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

Fix errors from running unit tests (some tests still fail)

Browse Source
This commit is contained in:
Calen Pennington
2012-12-18 09:32:36 -05:00
parent 2879853eee
commit 8693d288c8
11 changed files with 78 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/djangoapps/courseware/access.py
View File

@@ -226,9 +226,9 @@ def _has_access_descriptor(user, descriptor, action, course_context=None):
return True
# Check start date
if descriptor.start is not None:
if descriptor.lms.start is not None:
now = time.gmtime()
if now > descriptor.start:
if now > descriptor.lms.start:
# after start date, everyone can see it
debug("Allow: now > start date")
return True

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

@@ -36,6 +36,8 @@ def yield_dynamic_descriptor_descendents(descriptor, module_creator):
def get_dynamic_descriptor_children(descriptor):
if descriptor.has_dynamic_children():
module = module_creator(descriptor)
if module is None:
print "FOO", descriptor
child_locations = module.get_children_locations()
return [descriptor.system.load_item(child_location) for child_location in child_locations ]
else:

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

@@ -313,9 +313,11 @@ def _get_module(user, request, location, student_module_cache, course_id, positi
import_system = descriptor.system
if has_access(user, location, 'staff', course_id):
err_descriptor = ErrorDescriptor.from_xml(str(descriptor), import_system,
org=descriptor.location.org, course=descriptor.location.course,
error_msg=exc_info_to_str(sys.exc_info()))
else:
err_descriptor = NonStaffErrorDescriptor.from_xml(str(descriptor), import_system,
org=descriptor.location.org, course=descriptor.location.course,
error_msg=exc_info_to_str(sys.exc_info()))
# Make an error module