From 263700954e53a27b3711d642e79fce0eccfa7f30 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Fri, 28 Jun 2013 15:12:57 -0700 Subject: [PATCH] Added link to series from episode details --- UI/Episode/Layout.js | 14 +++++++------- UI/Episode/LayoutTemplate.html | 4 ++++ UI/Series/Details/SeasonLayout.js | 4 ++++ UI/Series/EpisodeModel.js | 3 ++- UI/Series/SeriesModel.js | 1 - 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/UI/Episode/Layout.js b/UI/Episode/Layout.js index 1caee5abf..d895c99f5 100644 --- a/UI/Episode/Layout.js +++ b/UI/Episode/Layout.js @@ -26,19 +26,19 @@ define( events: { - 'click .x-episode-summary' : 'showSummary', - 'click .x-episode-activity': 'showActivity', - 'click .x-episode-search' : 'showSearch' + 'click .x-episode-summary' : '_showSummary', + 'click .x-episode-activity': '_showActivity', + 'click .x-episode-search' : '_showSearch' }, onShow: function () { - this.showSummary(); + this._showSummary(); this._releaseSearchActivated = false; }, - showSummary: function (e) { + _showSummary: function (e) { if (e) { e.preventDefault(); } @@ -48,7 +48,7 @@ define( }, - showActivity: function (e) { + _showActivity: function (e) { if (e) { e.preventDefault(); } @@ -56,7 +56,7 @@ define( this.ui.activity.tab('show'); }, - showSearch: function (e) { + _showSearch: function (e) { if (e) { e.preventDefault(); } diff --git a/UI/Episode/LayoutTemplate.html b/UI/Episode/LayoutTemplate.html index 91c903cf5..6d3c1736b 100644 --- a/UI/Episode/LayoutTemplate.html +++ b/UI/Episode/LayoutTemplate.html @@ -16,6 +16,10 @@ diff --git a/UI/Series/Details/SeasonLayout.js b/UI/Series/Details/SeasonLayout.js index 8a67a1b41..01cd6ea6a 100644 --- a/UI/Series/Details/SeasonLayout.js +++ b/UI/Series/Details/SeasonLayout.js @@ -65,6 +65,10 @@ define( } this.episodeCollection = options.episodeCollection.bySeason(this.model.get('seasonNumber')); + + _.each(this.episodeCollection.models, function (episode) { + episode.set({ hideSeriesLink: true }); + }); }, onShow: function () { diff --git a/UI/Series/EpisodeModel.js b/UI/Series/EpisodeModel.js index 0321c1e77..05e3e4eff 100644 --- a/UI/Series/EpisodeModel.js +++ b/UI/Series/EpisodeModel.js @@ -89,7 +89,8 @@ define( defaults: { seasonNumber: 0, - status : 0 + status : 0, + title : 'TBA' } }); }); diff --git a/UI/Series/SeriesModel.js b/UI/Series/SeriesModel.js index dcd9c97a3..40b8a787b 100644 --- a/UI/Series/SeriesModel.js +++ b/UI/Series/SeriesModel.js @@ -54,7 +54,6 @@ define( }, route : function () { return '/series/' + this.get('titleSlug'); - //return '/series/details/' + this.get('id'); }, qualityProfile: function () {