diff --git a/lms/djangoapps/teams/static/teams/js/spec/views/teams_tab_spec.js b/lms/djangoapps/teams/static/teams/js/spec/views/teams_tab_spec.js index cb7f8fc4b9..194eb73029 100644 --- a/lms/djangoapps/teams/static/teams/js/spec/views/teams_tab_spec.js +++ b/lms/djangoapps/teams/static/teams/js/spec/views/teams_tab_spec.js @@ -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}); diff --git a/lms/djangoapps/teams/static/teams/js/views/teams_tab.js b/lms/djangoapps/teams/static/teams/js/views/teams_tab.js index d9fc7a721f..04b2ec1221 100644 --- a/lms/djangoapps/teams/static/teams/js/views/teams_tab.js +++ b/lms/djangoapps/teams/static/teams/js/views/teams_tab.js @@ -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,