Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
069a9051
Commit
069a9051
authored
Jul 26, 2017
by
Diana Huang
Committed by
GitHub
Jul 26, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #15671 from edx/diana/tabs-issues
Handle tab hiding at a different level.
parents
91ad611f
482b63ba
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
4 deletions
+12
-4
lms/djangoapps/courseware/tabs.py
+4
-4
lms/djangoapps/courseware/tests/test_tabs.py
+8
-0
No files found.
lms/djangoapps/courseware/tabs.py
View file @
069a9051
...
...
@@ -70,10 +70,7 @@ class CourseInfoTab(CourseTab):
@classmethod
def
is_enabled
(
cls
,
course
,
user
=
None
):
"""
The "Home" tab is not shown for the new unified course experience.
"""
return
not
UNIFIED_COURSE_TAB_FLAG
.
is_enabled
(
course
.
id
)
return
True
class
SyllabusTab
(
EnrolledTab
):
...
...
@@ -326,6 +323,9 @@ def get_course_tab_list(request, course):
if
tab
.
type
!=
'courseware'
:
continue
tab
.
name
=
_
(
"Entrance Exam"
)
# TODO: LEARNER-611 - once the course_info tab is removed, remove this code
if
UNIFIED_COURSE_TAB_FLAG
.
is_enabled
(
course
.
id
)
and
tab
.
type
==
'course_info'
:
continue
if
tab
.
type
==
'static_tab'
and
tab
.
course_staff_only
and
\
not
bool
(
user
and
has_access
(
user
,
'staff'
,
course
,
course
.
id
)):
continue
...
...
lms/djangoapps/courseware/tests/test_tabs.py
View file @
069a9051
...
...
@@ -792,6 +792,14 @@ class CourseInfoTabTestCase(TabTestCase):
tabs
=
get_course_tab_list
(
self
.
request
,
self
.
course
)
self
.
assertEqual
(
tabs
[
0
]
.
type
,
'courseware'
)
# TODO: LEARNER-611 - remove once course_info is removed.
@override_waffle_flag
(
UNIFIED_COURSE_TAB_FLAG
,
active
=
True
)
def
test_default_tab_for_displayable
(
self
):
tabs
=
xmodule_tabs
.
CourseTabList
.
iterate_displayable
(
self
.
course
,
self
.
user
)
for
i
,
tab
in
enumerate
(
tabs
):
if
i
==
0
:
self
.
assertEqual
(
tab
.
type
,
'course_info'
)
@attr
(
shard
=
1
)
class
DiscussionLinkTestCase
(
TabTestCase
):
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment