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
5f531044
Commit
5f531044
authored
Sep 10, 2015
by
Andy Armstrong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove unnecessary breadcrumbs for Teams tab
TNL-3249
parent
17e64535
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
6 deletions
+14
-6
lms/djangoapps/teams/static/teams/js/spec/views/teams_tab_spec.js
+8
-0
lms/djangoapps/teams/static/teams/js/views/teams_tab.js
+6
-6
No files found.
lms/djangoapps/teams/static/teams/js/spec/views/teams_tab_spec.js
View file @
5f531044
...
...
@@ -58,6 +58,14 @@ define([
afterEach
(
Backbone
.
history
.
stop
);
describe
(
'Navigation'
,
function
()
{
it
(
'does not render breadcrumbs for the top level tabs'
,
function
()
{
var
teamsTabView
=
createTeamsTabView
();
teamsTabView
.
router
.
navigate
(
'#my-teams'
,
{
trigger
:
true
});
expect
(
teamsTabView
.
$
(
'.breadcrumbs'
).
length
).
toBe
(
0
);
teamsTabView
.
router
.
navigate
(
'#browse'
,
{
trigger
:
true
});
expect
(
teamsTabView
.
$
(
'.breadcrumbs'
).
length
).
toBe
(
0
);
});
it
(
'does not interfere with anchor links to #content'
,
function
()
{
var
teamsTabView
=
createTeamsTabView
();
teamsTabView
.
router
.
navigate
(
'#content'
,
{
trigger
:
true
});
...
...
lms/djangoapps/teams/static/teams/js/views/teams_tab.js
View file @
5f531044
...
...
@@ -220,7 +220,6 @@
{
searchString
:
view
.
teamsCollection
.
searchString
},
true
),
breadcrumbs
:
view
.
createBreadcrumbs
(
topic
),
showSortControls
:
false
});
view
.
render
();
...
...
@@ -239,6 +238,7 @@
topic
:
topic
,
title
:
gettext
(
"Create a New Team"
),
description
:
gettext
(
"Create a new team if you can't find an existing team to join, or if you would like to learn with friends you know."
),
breadcrumbs
:
view
.
createBreadcrumbs
(
topic
),
mainView
:
new
TeamEditView
({
action
:
'create'
,
teamEvents
:
view
.
teamEvents
,
...
...
@@ -272,6 +272,7 @@
editViewWithHeader
=
self
.
createViewWithHeader
({
title
:
gettext
(
"Edit Team"
),
description
:
gettext
(
"If you make significant changes, make sure you notify members of the team before making these changes."
),
breadcrumbs
:
self
.
createBreadcrumbs
(
topic
,
team
),
mainView
:
view
,
topic
:
topic
,
team
:
team
,
...
...
@@ -297,6 +298,7 @@
});
self
.
mainView
=
self
.
createViewWithHeader
({
mainView
:
view
,
breadcrumbs
:
self
.
createBreadcrumbs
(
topic
,
team
),
title
:
gettext
(
"Membership"
),
description
:
gettext
(
"You can remove members from this team, especially if they have not participated in the team's activity."
),
topic
:
topic
,
...
...
@@ -366,7 +368,7 @@
headerActionsView
:
null
,
// TODO: add back SearchFieldView when search is enabled
title
:
options
.
title
,
description
:
options
.
description
,
breadcrumbs
:
options
.
breadcrumbs
breadcrumbs
:
this
.
createBreadcrumbs
()
}),
searchUrl
=
'topics/'
+
topic
.
get
(
'id'
)
+
'/search'
;
// Listen to requests to sync the collection and redirect it as follows:
...
...
@@ -433,7 +435,8 @@
mainView
:
view
,
subject
:
team
,
topic
:
topic
,
headerActionsView
:
TeamProfileActionsView
headerActionsView
:
TeamProfileActionsView
,
breadcrumbs
:
self
.
createBreadcrumbs
(
topic
)
}
)
);
...
...
@@ -470,9 +473,6 @@
breadcrumbs
=
options
.
breadcrumbs
,
title
=
options
.
title
||
subject
.
get
(
'name'
),
description
=
options
.
description
||
subject
.
get
(
'description'
);
if
(
!
breadcrumbs
)
{
breadcrumbs
=
this
.
createBreadcrumbs
(
options
.
topic
,
options
.
team
);
}
return
new
TeamsHeaderModel
({
breadcrumbs
:
breadcrumbs
,
title
:
title
,
...
...
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