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

Merge pull request #21467 from edx/BOM-191

Browse Source 
BOM-191 Python 3 fixes
This commit is contained in:
Aarif
2019-08-29 17:06:39 +05:00
committed by GitHub
parent 2e92668e9e a66cf74c5c
commit 4b0f528ca4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -608,7 +608,7 @@ def get_current_child(xmodule, min_depth=None, requested_child=None):
def _get_default_child_module(child_modules):
"""Returns the first child of xmodule, subject to min_depth."""
if min_depth <= 0:
if min_depth is None or min_depth <= 0:
return _get_child(child_modules)
else:
content_children = [
@@ -625,7 +625,7 @@ def get_current_child(xmodule, min_depth=None, requested_child=None):
pos = xmodule.position - 1 # position is 1-indexed
if 0 <= pos < len(children):
child = children[pos]
if min_depth > 0 and not child.has_children_at_depth(min_depth - 1):
if min_depth is not None and (min_depth > 0 and not child.has_children_at_depth(min_depth - 1)):
child = None
if child is None:
child = _get_default_child_module(children)