From 70cfa5e68571bf7cb083e9aa50465df008fafc5b Mon Sep 17 00:00:00 2001 From: "kay.one" Date: Sun, 9 Jun 2013 13:51:32 -0700 Subject: [PATCH] cleaned up all the cells. there is a cell for pretty much everything. --- .../MappingTests/ResourceMappingFixture.cs | 1 - NzbDrone.Api/Indexers/ReleaseResource.cs | 2 + NzbDrone.Api/Mapping/MappingValidation.cs | 7 +- .../Reflection/ReflectionExtensions.cs | 3 +- NzbDrone.ncrunchsolution | 2 +- UI/.idea/dictionaries/Keivan.xml | 1 + UI/Cells/AirDateCell.js | 15 +++ UI/Cells/EpisodeNumberCell.js | 34 +++++ .../Details => Cells}/EpisodeStatusCell.js | 4 +- .../Details => Cells}/EpisodeTitleCell.js | 11 +- UI/Cells/FileSizeCell.js | 15 +++ UI/Cells/IndexerCell.js | 13 ++ UI/Cells/NzbDroneCell.js | 40 ++++++ UI/Cells/QualityCell.js | 9 ++ UI/{History => Cells}/QualityTemplate.html | 0 UI/Cells/RelativeDateCell.js | 13 ++ UI/Cells/SeriesTitleCell.js | 9 ++ UI/Cells/SeriesTitleTemplate.html | 2 + UI/Cells/TemplatedCell.js | 19 +++ UI/{Shared => }/Cells/ToggleCell.js | 2 +- UI/Cells/cells.less | 7 ++ UI/Episode/Search/Layout.js | 11 +- UI/History/EpisodeTitleTemplate.html | 1 - UI/History/HistoryLayout.js | 62 ++++----- UI/History/Model.js | 10 +- UI/Index.html | 2 +- UI/Missing/EpisodeColumnTemplate.html | 2 - UI/Missing/MissingLayout.js | 51 ++++---- UI/Missing/SeriesTitleTemplate.html | 2 - UI/Mixins/backbone.Backgrid.mixin.js | 13 -- .../Cells => Release}/ApprovalStatusCell.js | 2 +- UI/Release/DownloadReportCell.js | 27 ++++ UI/Release/Layout.js | 17 ++- UI/Series/Details/SeasonLayout.js | 118 +++++++++--------- UI/Series/Edit/EditSeriesView.js | 11 +- UI/Series/EpisodeModel.js | 9 +- UI/Series/Index/SeriesIndexLayout.js | 78 ++++++------ UI/Series/Index/Table/AirDateCell.js | 13 -- UI/Shared/BackgridPaginatorTemplate.html | 3 +- UI/Shared/Cells/EpisodeNumberCell.js | 30 ----- UI/Shared/Cells/FileSizeCell.js | 12 -- UI/app.js | 10 +- 42 files changed, 432 insertions(+), 261 deletions(-) create mode 100644 UI/Cells/AirDateCell.js create mode 100644 UI/Cells/EpisodeNumberCell.js rename UI/{Series/Details => Cells}/EpisodeStatusCell.js (85%) rename UI/{Series/Details => Cells}/EpisodeTitleCell.js (52%) create mode 100644 UI/Cells/FileSizeCell.js create mode 100644 UI/Cells/IndexerCell.js create mode 100644 UI/Cells/NzbDroneCell.js create mode 100644 UI/Cells/QualityCell.js rename UI/{History => Cells}/QualityTemplate.html (100%) create mode 100644 UI/Cells/RelativeDateCell.js create mode 100644 UI/Cells/SeriesTitleCell.js create mode 100644 UI/Cells/SeriesTitleTemplate.html create mode 100644 UI/Cells/TemplatedCell.js rename UI/{Shared => }/Cells/ToggleCell.js (92%) create mode 100644 UI/Cells/cells.less delete mode 100644 UI/History/EpisodeTitleTemplate.html delete mode 100644 UI/Missing/EpisodeColumnTemplate.html delete mode 100644 UI/Missing/SeriesTitleTemplate.html rename UI/{Shared/Cells => Release}/ApprovalStatusCell.js (84%) create mode 100644 UI/Release/DownloadReportCell.js delete mode 100644 UI/Series/Index/Table/AirDateCell.js delete mode 100644 UI/Shared/Cells/EpisodeNumberCell.js delete mode 100644 UI/Shared/Cells/FileSizeCell.js diff --git a/NzbDrone.Api.Test/MappingTests/ResourceMappingFixture.cs b/NzbDrone.Api.Test/MappingTests/ResourceMappingFixture.cs index 50831a45c..2d5c19f0f 100644 --- a/NzbDrone.Api.Test/MappingTests/ResourceMappingFixture.cs +++ b/NzbDrone.Api.Test/MappingTests/ResourceMappingFixture.cs @@ -40,7 +40,6 @@ public class ResourceMappingFixture : TestBase [TestCase(typeof(DownloadDecision), typeof(ReleaseResource))] [TestCase(typeof(Core.History.History), typeof(HistoryResource))] [TestCase(typeof(UpdatePackage), typeof(UpdateResource))] - [TestCase(typeof(QualityProfile), typeof(QualityProfileResource))] [TestCase(typeof(Quality), typeof(QualityResource))] [TestCase(typeof(Log), typeof(LogResource))] public void matching_fields(Type modelType, Type resourceType) diff --git a/NzbDrone.Api/Indexers/ReleaseResource.cs b/NzbDrone.Api/Indexers/ReleaseResource.cs index fbe121cbb..2ddac98f3 100644 --- a/NzbDrone.Api/Indexers/ReleaseResource.cs +++ b/NzbDrone.Api/Indexers/ReleaseResource.cs @@ -2,11 +2,13 @@ using System.Collections.Generic; using NzbDrone.Api.REST; using NzbDrone.Core.Parser; +using NzbDrone.Core.Tv; namespace NzbDrone.Api.Indexers { public class ReleaseResource : RestResource { + public QualityModel Quality { get; set; } public Int32 Age { get; set; } public Int64 Size { get; set; } public String Indexer { get; set; } diff --git a/NzbDrone.Api/Mapping/MappingValidation.cs b/NzbDrone.Api/Mapping/MappingValidation.cs index 00cf1f681..13e657b13 100644 --- a/NzbDrone.Api/Mapping/MappingValidation.cs +++ b/NzbDrone.Api/Mapping/MappingValidation.cs @@ -3,7 +3,6 @@ using System.Reflection; using NzbDrone.Api.REST; using NzbDrone.Common.Reflection; -using NzbDrone.Core.Datastore; namespace NzbDrone.Api.Mapping { @@ -11,7 +10,7 @@ public static class MappingValidation { public static void ValidateMapping(Type modelType, Type resourceType) { - var errors = modelType.GetSimpleProperties().Select(p => GetError(resourceType, p)).Where(c => c != null).ToList(); + var errors = modelType.GetSimpleProperties().Where(c=>!c.GetGetMethod().IsStatic).Select(p => GetError(resourceType, p)).Where(c => c != null).ToList(); if (errors.Any()) { @@ -48,9 +47,9 @@ private static string GetError(Type resourceType, PropertyInfo modelProperty) return string.Format("public {0} {1} {{ get; set; }}", modelProperty.PropertyType.Name, modelProperty.Name); } - if (resourceProperty.PropertyType != modelProperty.PropertyType) + if (resourceProperty.PropertyType != modelProperty.PropertyType && !typeof(RestResource).IsAssignableFrom(resourceProperty.PropertyType)) { - return string.Format("Excpected {0}.{1} to have type of {2} but found {3}", resourceType.Name, resourceProperty.Name, modelProperty.PropertyType, resourceProperty.PropertyType); + return string.Format("Expected {0}.{1} to have type of {2} but found {3}", resourceType.Name, resourceProperty.Name, modelProperty.PropertyType, resourceProperty.PropertyType); } return null; diff --git a/NzbDrone.Common/Reflection/ReflectionExtensions.cs b/NzbDrone.Common/Reflection/ReflectionExtensions.cs index 98ff9ff12..c04da73fc 100644 --- a/NzbDrone.Common/Reflection/ReflectionExtensions.cs +++ b/NzbDrone.Common/Reflection/ReflectionExtensions.cs @@ -33,7 +33,8 @@ public static bool IsSimpleType(this Type type) || type == typeof(string) || type == typeof(DateTime) || type == typeof(Version) - || type == typeof(Decimal); + || type == typeof(Decimal) + || type.GetInterface("IEmbeddedDocument") != null; } public static bool IsReadable(this PropertyInfo propertyInfo) diff --git a/NzbDrone.ncrunchsolution b/NzbDrone.ncrunchsolution index 969da6dd4..444b34b1d 100644 --- a/NzbDrone.ncrunchsolution +++ b/NzbDrone.ncrunchsolution @@ -1,6 +1,6 @@ 1 - True + False true true UseDynamicAnalysis diff --git a/UI/.idea/dictionaries/Keivan.xml b/UI/.idea/dictionaries/Keivan.xml index 6089d177c..a57f1692c 100644 --- a/UI/.idea/dictionaries/Keivan.xml +++ b/UI/.idea/dictionaries/Keivan.xml @@ -8,6 +8,7 @@ rootfolder rootfolders signalr + templated thetvdb trakt tvdb diff --git a/UI/Cells/AirDateCell.js b/UI/Cells/AirDateCell.js new file mode 100644 index 000000000..702afbb7c --- /dev/null +++ b/UI/Cells/AirDateCell.js @@ -0,0 +1,15 @@ +"use strict"; +define(['app', 'Shared/FormatHelpers'], function () { + NzbDrone.Cells.AirDateCell = Backgrid.Cell.extend({ + className: "air-date-cell", + + render: function () { + + this.$el.empty(); + var airDate = this.model.get(this.column.get("name")); + this.$el.html(NzbDrone.Shared.FormatHelpers.DateHelper(airDate)); + return this; + + } + }); +}); diff --git a/UI/Cells/EpisodeNumberCell.js b/UI/Cells/EpisodeNumberCell.js new file mode 100644 index 000000000..6e20c1cd0 --- /dev/null +++ b/UI/Cells/EpisodeNumberCell.js @@ -0,0 +1,34 @@ +"use strict"; + +define(['app', 'Cells/NzbDroneCell'], function () { + NzbDrone.Cells.EpisodeNumberCell = NzbDrone.Cells.NzbDroneCell.extend({ + + className: "episode-number-cell", + + render: function () { + + var airDate = this.cellValue.get('airDate') || this.get(this.column.get("airDate")); + var seasonNumber = this.cellValue.get('seasonNumber') || this.model.get(this.column.get("seasonNumber")); + var episodes = this.cellValue.get('episodeNumber') || this.model.get(this.column.get("episodes")); + + var result = 'Unknown'; + + if (airDate) { + + result = new Date(airDate).toLocaleDateString(); + } + else { + + var paddedEpisodes = _.map(episodes, function (episodeNumber) { + return episodeNumber.pad(2); + }); + + result = 'S{0}-E{1}'.format(seasonNumber, paddedEpisodes.join()); + } + + this.$el.html(result); + this.delegateEvents(); + return this; + } + }); +}); diff --git a/UI/Series/Details/EpisodeStatusCell.js b/UI/Cells/EpisodeStatusCell.js similarity index 85% rename from UI/Series/Details/EpisodeStatusCell.js rename to UI/Cells/EpisodeStatusCell.js index 478326345..4401eeb4c 100644 --- a/UI/Series/Details/EpisodeStatusCell.js +++ b/UI/Cells/EpisodeStatusCell.js @@ -1,7 +1,7 @@ "use strict"; -define(['app', 'Episode/Layout'], function () { - NzbDrone.Series.Details.EpisodeStatusCell = Backgrid.Cell.extend({ +define(['app' ], function () { + NzbDrone.Cells.EpisodeStatusCell = Backgrid.Cell.extend({ className: 'episode-status-cell', diff --git a/UI/Series/Details/EpisodeTitleCell.js b/UI/Cells/EpisodeTitleCell.js similarity index 52% rename from UI/Series/Details/EpisodeTitleCell.js rename to UI/Cells/EpisodeTitleCell.js index 5e2983ee8..0d2731a9a 100644 --- a/UI/Series/Details/EpisodeTitleCell.js +++ b/UI/Cells/EpisodeTitleCell.js @@ -1,7 +1,7 @@ "use strict"; -define(['app', 'Episode/Layout'], function () { - NzbDrone.Series.Details.EpisodeTitleCell = Backgrid.StringCell.extend({ +define(['app', 'Cells/NzbDroneCell'], function () { + NzbDrone.Cells.EpisodeTitleCell = NzbDrone.Cells.NzbDroneCell.extend({ className: 'episode-title-cell', @@ -10,8 +10,13 @@ define(['app', 'Episode/Layout'], function () { }, showDetails: function () { - var view = new NzbDrone.Episode.Layout({ model: this.model }); + var view = new NzbDrone.Episode.Layout({ model: this.cellValue }); NzbDrone.modalRegion.show(view); + }, + + render: function () { + this.$el.html(this.cellValue.get('title')); + return this; } }); }); diff --git a/UI/Cells/FileSizeCell.js b/UI/Cells/FileSizeCell.js new file mode 100644 index 000000000..b80ec579d --- /dev/null +++ b/UI/Cells/FileSizeCell.js @@ -0,0 +1,15 @@ +"use strict"; + +define(['app', 'Shared/FormatHelpers'], function () { + NzbDrone.Cells.FileSizeCell = Backgrid.Cell.extend({ + + className: "file-size-cell", + + render: function () { + var size = this.model.get(this.column.get("name")); + this.$el.html(NzbDrone.Shared.FormatHelpers.FileSizeHelper(size)); + this.delegateEvents(); + return this; + } + }); +}); diff --git a/UI/Cells/IndexerCell.js b/UI/Cells/IndexerCell.js new file mode 100644 index 000000000..485e32fd3 --- /dev/null +++ b/UI/Cells/IndexerCell.js @@ -0,0 +1,13 @@ +"use strict"; +define(['app'], function () { + NzbDrone.Cells.IndexerCell = Backgrid.Cell.extend({ + + class : 'indexer-cell', + + render: function () { + var indexer = this.model.get(this.column.get('name')); + this.$el.html(indexer); + return this; + } + }); +}); diff --git a/UI/Cells/NzbDroneCell.js b/UI/Cells/NzbDroneCell.js new file mode 100644 index 000000000..3decea035 --- /dev/null +++ b/UI/Cells/NzbDroneCell.js @@ -0,0 +1,40 @@ +"use strict"; + +define(['app'], function () { + NzbDrone.Cells.NzbDroneCell = Backgrid.Cell.extend({ + + _originalInit: Backgrid.Cell.prototype.initialize, + + + initialize: function () { + this._originalInit.apply(this, arguments); + this.cellValue = this._getValue(); + + this.model.on('change', this._refresh, this); + }, + + _refresh: function () { + this.cellValue = this._getValue(); + this.render(); + }, + + _getValue: function () { + + var name = this.column.get('name'); + + if(name === 'this'){ + return this.model; + } + + var value = this.model.get(name); + + //if not a model + if (!value.get) { + return value = new Backbone.Model(value); + } + + return value; + } + + }); +}); diff --git a/UI/Cells/QualityCell.js b/UI/Cells/QualityCell.js new file mode 100644 index 000000000..cbc2c74c7 --- /dev/null +++ b/UI/Cells/QualityCell.js @@ -0,0 +1,9 @@ +"use strict"; +define(['app', 'Cells/TemplatedCell'], function () { + NzbDrone.Cells.QualityCell = NzbDrone.Cells.TemplatedCell.extend({ + + className: 'quality-cell', + template : 'Cells/QualityTemplate' + + }); +}); diff --git a/UI/History/QualityTemplate.html b/UI/Cells/QualityTemplate.html similarity index 100% rename from UI/History/QualityTemplate.html rename to UI/Cells/QualityTemplate.html diff --git a/UI/Cells/RelativeDateCell.js b/UI/Cells/RelativeDateCell.js new file mode 100644 index 000000000..6db0cc95c --- /dev/null +++ b/UI/Cells/RelativeDateCell.js @@ -0,0 +1,13 @@ +"use strict"; +define(['app'], function () { + NzbDrone.Cells.RelativeDateCell = Backgrid.Cell.extend({ + + render: function () { + + var date = this.model.get(this.column.get('name')); + this.$el.html(Date.create(date).relative()); + + return this; + } + }); +}); diff --git a/UI/Cells/SeriesTitleCell.js b/UI/Cells/SeriesTitleCell.js new file mode 100644 index 000000000..8d86eb5e1 --- /dev/null +++ b/UI/Cells/SeriesTitleCell.js @@ -0,0 +1,9 @@ +"use strict"; +define(['app', 'Cells/TemplatedCell'], function () { + NzbDrone.Cells.SeriesTitleCell = NzbDrone.Cells.TemplatedCell.extend({ + + className: 'series-title', + template : 'Cells/SeriesTitleTemplate' + + }); +}); diff --git a/UI/Cells/SeriesTitleTemplate.html b/UI/Cells/SeriesTitleTemplate.html new file mode 100644 index 000000000..4b65dc63a --- /dev/null +++ b/UI/Cells/SeriesTitleTemplate.html @@ -0,0 +1,2 @@ +{{title}} +{{debug}} diff --git a/UI/Cells/TemplatedCell.js b/UI/Cells/TemplatedCell.js new file mode 100644 index 000000000..d7ccd820f --- /dev/null +++ b/UI/Cells/TemplatedCell.js @@ -0,0 +1,19 @@ +"use strict"; + +define(['app','Cells/NzbDroneCell'], function () { + NzbDrone.Cells.TemplatedCell = NzbDrone.Cells.NzbDroneCell.extend({ + + + render: function () { + + var templateName = this.column.get('template') || this.template; + + this.templateFunction = Marionette.TemplateCache.get(templateName); + var data = this.cellValue.toJSON(); + var html = this.templateFunction(data); + this.$el.html(html); + + return this; + } + }); +}); diff --git a/UI/Shared/Cells/ToggleCell.js b/UI/Cells/ToggleCell.js similarity index 92% rename from UI/Shared/Cells/ToggleCell.js rename to UI/Cells/ToggleCell.js index d0c60aeba..4c8b8ce65 100644 --- a/UI/Shared/Cells/ToggleCell.js +++ b/UI/Cells/ToggleCell.js @@ -1,7 +1,7 @@ "use strict"; define(['app', 'Episode/Layout'], function () { - NzbDrone.Shared.Cells.ToggleCell = Backgrid.Cell.extend({ + NzbDrone.Cells.ToggleCell = Backgrid.Cell.extend({ className: 'toggle-cell clickable', diff --git a/UI/Cells/cells.less b/UI/Cells/cells.less new file mode 100644 index 000000000..1bf0b98a1 --- /dev/null +++ b/UI/Cells/cells.less @@ -0,0 +1,7 @@ +@import "../content/Bootstrap/mixins"; +@import "../content/Bootstrap/variables"; +@import "../content/Bootstrap/buttons"; + +.episode-title-cell { + .btn-link; +} diff --git a/UI/Episode/Search/Layout.js b/UI/Episode/Search/Layout.js index cb4cf9fac..a129f093e 100644 --- a/UI/Episode/Search/Layout.js +++ b/UI/Episode/Search/Layout.js @@ -1,5 +1,5 @@ "use strict"; -define(['app', 'Shared/Cells/FileSizeCell', 'Shared/Cells/ApprovalStatusCell'], function () { +define(['app', 'Cells/FileSizeCell', 'Release/ApprovalStatusCell', 'Release/DownloadReportCell' ], function () { NzbDrone.Episode.Search.Layout = Backbone.Marionette.Layout.extend({ template: 'Episode/Search/LayoutTemplate', @@ -19,7 +19,7 @@ define(['app', 'Shared/Cells/FileSizeCell', 'Shared/Cells/ApprovalStatusCell'], name : 'size', label : 'Size', sortable: true, - cell : NzbDrone.Shared.Cells.FileSizeCell + cell : NzbDrone.Cells.FileSizeCell }, { name : 'title', @@ -30,7 +30,12 @@ define(['app', 'Shared/Cells/FileSizeCell', 'Shared/Cells/ApprovalStatusCell'], { name : 'rejections', label: 'decision', - cell : NzbDrone.Shared.Cells.ApprovalStatusCell + cell : NzbDrone.Release.ApprovalStatusCell + }, + { + name : 'download', + label: '', + cell : NzbDrone.Release.DownloadReportCell } ], diff --git a/UI/History/EpisodeTitleTemplate.html b/UI/History/EpisodeTitleTemplate.html deleted file mode 100644 index 616580cbe..000000000 --- a/UI/History/EpisodeTitleTemplate.html +++ /dev/null @@ -1 +0,0 @@ -{{episode.title}} \ No newline at end of file diff --git a/UI/History/HistoryLayout.js b/UI/History/HistoryLayout.js index 66ec7c34d..2610a2b06 100644 --- a/UI/History/HistoryLayout.js +++ b/UI/History/HistoryLayout.js @@ -2,7 +2,13 @@ define([ 'app', 'History/Collection', - 'Series/Index/Table/AirDateCell', + 'Cells/RelativeDateCell', + 'Cells/IndexerCell', + 'Cells/TemplatedCell', + 'Cells/SeriesTitleCell', + 'Cells/EpisodeNumberCell', + 'Cells/EpisodeTitleCell', + 'Cells/QualityCell', 'Shared/Toolbar/ToolbarLayout', 'Shared/LoadingView' ], @@ -18,42 +24,36 @@ define([ columns: [ { - name : 'indexer', - label : '', - cell : Backgrid.TemplateBackedCell.extend({ template: 'History/IndexerTemplate' }) + name : 'indexer', + label: '', + cell : NzbDrone.Cells.IndexerCell }, { - name : 'Series.Title', - label : 'Series Title', - cell : Backgrid.TemplateBackedCell.extend({ template: 'Missing/SeriesTitleTemplate' }) + name : 'series', + label : 'Series', + cell : NzbDrone.Cells.SeriesTitleCell }, { - name : 'episode', - label : 'Episode', - sortable : false, - cell : Backgrid.TemplateBackedCell.extend({ template: 'Missing/EpisodeColumnTemplate' }) + name : 'episode', + label : 'Episode', + sortable: false, + cell : NzbDrone.Cells.EpisodeNumberCell }, { - name : 'Episode.Title', - label : 'Episode Title', - sortable : false, - cell : Backgrid.TemplateBackedCell.extend({ template: 'History/EpisodeTitleTemplate' }) + name : 'episode', + label : 'Episode Title', + sortable: false, + cell : NzbDrone.Cells.EpisodeTitleCell }, { - name : 'quality', - label : 'Quality', - cell : Backgrid.TemplateBackedCell.extend({ template: 'History/QualityTemplate' }) + name : 'quality', + label: 'Quality', + cell : NzbDrone.Cells.QualityCell }, { - name : 'date', - label : 'Grabbed', - cell : 'airDate' - }, - { - name : 'edit', - label : '', - sortable : false, - cell : Backgrid.TemplateBackedCell.extend({ template: 'History/ControlsColumnTemplate' }) + name : 'date', + label: 'Date', + cell : NzbDrone.Cells.RelativeDateCell } ], @@ -68,7 +68,7 @@ define([ })); this.pager.show(new Backgrid.NzbDronePaginator({ - columns: this.columns, + columns : this.columns, collection: this.historyCollection })); }, @@ -80,9 +80,9 @@ define([ this.historyCollection = new NzbDrone.History.Collection(); this.historyCollection.fetch() - .done(function () { - self._showTable(); - }); + .done(function () { + self._showTable(); + }); //this.toolbar.show(new NzbDrone.Shared.Toolbar.ToolbarLayout({right: [ viewButtons], context: this})); } diff --git a/UI/History/Model.js b/UI/History/Model.js index 8931767d8..3db750b81 100644 --- a/UI/History/Model.js +++ b/UI/History/Model.js @@ -1,5 +1,5 @@ "use strict"; -define(['app'], function (app) { +define(['app','Series/SeriesModel', 'Series/EpisodeModel'], function () { NzbDrone.History.Model = Backbone.Model.extend({ mutators: { seasonNumber: function () { @@ -9,6 +9,14 @@ define(['app'], function (app) { paddedEpisodeNumber: function () { return this.get('episode').episodeNumber.pad(2); } + }, + + parse: function (model) { + model.series = new NzbDrone.Series.SeriesModel(model.series); + model.episode = new NzbDrone.Series.EpisodeModel(model.episode); + return model; } + + }); }); diff --git a/UI/Index.html b/UI/Index.html index 8b507f8b3..b6710d195 100644 --- a/UI/Index.html +++ b/UI/Index.html @@ -9,6 +9,7 @@ + @@ -84,7 +85,6 @@ - diff --git a/UI/Missing/EpisodeColumnTemplate.html b/UI/Missing/EpisodeColumnTemplate.html deleted file mode 100644 index 30ab0a188..000000000 --- a/UI/Missing/EpisodeColumnTemplate.html +++ /dev/null @@ -1,2 +0,0 @@ - -{{seasonNumber}}x{{paddedEpisodeNumber}} \ No newline at end of file diff --git a/UI/Missing/MissingLayout.js b/UI/Missing/MissingLayout.js index 6a1411400..fdd4e32d8 100644 --- a/UI/Missing/MissingLayout.js +++ b/UI/Missing/MissingLayout.js @@ -2,9 +2,14 @@ define([ 'app', 'Missing/Collection', - 'Series/Index/Table/AirDateCell', + 'Missing/Row', + 'Cells/AirDateCell', 'Series/Index/Table/SeriesStatusCell', 'Shared/Toolbar/ToolbarLayout', + 'Cells/SeriesTitleCell', + 'Cells/EpisodeNumberCell', + 'Cells/EpisodeTitleCell', + 'Cells/AirDateCell', 'Shared/LoadingView' ], function () { @@ -19,33 +24,27 @@ define([ columns: [ { - name : 'series.Title', - label : 'Series Title', - sortable : false, - cell : Backgrid.TemplateBackedCell.extend({ template: 'Missing/SeriesTitleTemplate' }) + name : 'series', + label : 'Series Title', + sortable: false, + cell : NzbDrone.Cells.SeriesTitleCell }, { - name : 'episode', - label : 'Episode', - sortable : false, - cell : Backgrid.TemplateBackedCell.extend({ template: 'Missing/EpisodeColumnTemplate' }) + name : 'this', + label : 'Episode', + sortable: false, + cell : NzbDrone.Cells.EpisodeNumberCell }, { - name : 'title', - label : 'Episode Title', - sortable : false, - cell : 'string' + name : 'this', + label : 'Episode Title', + sortable: false, + cell : NzbDrone.Cells.EpisodeTitleCell }, { - name : 'airDate', - label : 'Air Date', - cell : 'airDate' - }, - { - name : 'edit', - label : '', - sortable : false, - cell : Backgrid.TemplateBackedCell.extend({ template: 'Missing/ControlsColumnTemplate' }) + name : 'airDate', + label: 'Air Date', + cell : NzbDrone.Cells.AirDateCell } ], @@ -59,7 +58,7 @@ define([ })); this.pager.show(new Backgrid.NzbDronePaginator({ - columns: this.columns, + columns : this.columns, collection: this.missingCollection })); }, @@ -71,9 +70,9 @@ define([ this.missingCollection = new NzbDrone.Missing.Collection(); this.missingCollection.fetch() - .done(function () { - self._showTable(); - }); + .done(function () { + self._showTable(); + }); } }); }); diff --git a/UI/Missing/SeriesTitleTemplate.html b/UI/Missing/SeriesTitleTemplate.html deleted file mode 100644 index aac503f3d..000000000 --- a/UI/Missing/SeriesTitleTemplate.html +++ /dev/null @@ -1,2 +0,0 @@ -{{! TODO: Should use route instead of hard coding link }} -{{series.title}} diff --git a/UI/Mixins/backbone.Backgrid.mixin.js b/UI/Mixins/backbone.Backgrid.mixin.js index 5975999c1..fe3572a42 100644 --- a/UI/Mixins/backbone.Backgrid.mixin.js +++ b/UI/Mixins/backbone.Backgrid.mixin.js @@ -11,19 +11,6 @@ Backgrid.Column.prototype.defaults = { headerCell: 'nzbDrone' }; -Backgrid.TemplateBackedCell = Backgrid.Cell.extend({ - className: '', - template : 'Series/Index/Table/ControlsColumnTemplate', - - render: function () { - var data = this.model.toJSON(); - var templateFunction = Marionette.TemplateCache.get(this.template); - var html = templateFunction(data); - this.$el.html(html); - - return this; - } -}); Backgrid.NzbDroneHeaderCell = Backgrid.HeaderCell.extend({ events: { diff --git a/UI/Shared/Cells/ApprovalStatusCell.js b/UI/Release/ApprovalStatusCell.js similarity index 84% rename from UI/Shared/Cells/ApprovalStatusCell.js rename to UI/Release/ApprovalStatusCell.js index 9062ac52b..b5662bdb6 100644 --- a/UI/Shared/Cells/ApprovalStatusCell.js +++ b/UI/Release/ApprovalStatusCell.js @@ -1,5 +1,5 @@ "use strict"; -NzbDrone.Shared.Cells.ApprovalStatusCell = Backgrid.Cell.extend({ +NzbDrone.Release.ApprovalStatusCell = Backgrid.Cell.extend({ className: "approval-status-cell", diff --git a/UI/Release/DownloadReportCell.js b/UI/Release/DownloadReportCell.js new file mode 100644 index 000000000..da996bbb0 --- /dev/null +++ b/UI/Release/DownloadReportCell.js @@ -0,0 +1,27 @@ +"use strict"; +NzbDrone.Release.DownloadReportCell = Backgrid.Cell.extend({ + + className: "download-report-cell", + + events: { + 'click': '_onClick' + }, + + _onClick: function () { + + var self = this; + + this.$el.html('