From e2314a7b1737f4e6dcc8c3cea59cde782a17a4df Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Sun, 17 Feb 2013 16:46:13 -0800 Subject: [PATCH] Fixed stuff :) NzbDrone.Console works again Added empty collection message for Series --- .gitignore | 1 + NzbDrone.Web/NzbDrone.Web.csproj | 3 +++ NzbDrone.Web/_backboneApp/Controller.js | 1 - NzbDrone.Web/_backboneApp/Routing.js | 1 - .../Series/EmptySeriesCollectionTemplate.html | 1 + NzbDrone.Web/_backboneApp/Series/SeriesCollectionView.js | 8 +++++++- NzbDrone.Web/_backboneApp/Series/SeriesModel.js | 4 ---- NzbDrone.Web/_backboneApp/app.js | 1 - NzbDrone/NzbDrone.Console.csproj | 8 ++++---- 9 files changed, 16 insertions(+), 12 deletions(-) create mode 100644 NzbDrone.Web/_backboneApp/Series/EmptySeriesCollectionTemplate.html diff --git a/.gitignore b/.gitignore index 5b6ffb3cc..14e5c939e 100644 --- a/.gitignore +++ b/.gitignore @@ -137,3 +137,4 @@ NzbDrone.Web/_backboneApp/.idea/. *.sqo *.userprefs */test-results/* +.idea/* \ No newline at end of file diff --git a/NzbDrone.Web/NzbDrone.Web.csproj b/NzbDrone.Web/NzbDrone.Web.csproj index db5b2eebc..12d40dae2 100644 --- a/NzbDrone.Web/NzbDrone.Web.csproj +++ b/NzbDrone.Web/NzbDrone.Web.csproj @@ -196,6 +196,7 @@ + @@ -406,6 +407,7 @@ + @@ -648,6 +650,7 @@ + diff --git a/NzbDrone.Web/_backboneApp/Controller.js b/NzbDrone.Web/_backboneApp/Controller.js index aad45516d..753942d88 100644 --- a/NzbDrone.Web/_backboneApp/Controller.js +++ b/NzbDrone.Web/_backboneApp/Controller.js @@ -10,7 +10,6 @@ series: function (action, query) { NzbDrone.mainRegion.show(new NzbDrone.Series.SeriesCollectionView(this, action, query)); this.setTitle('NzbDrone'); - }, notFound: function () { diff --git a/NzbDrone.Web/_backboneApp/Routing.js b/NzbDrone.Web/_backboneApp/Routing.js index e75abc97a..656d61ca9 100644 --- a/NzbDrone.Web/_backboneApp/Routing.js +++ b/NzbDrone.Web/_backboneApp/Routing.js @@ -13,7 +13,6 @@ } }); - NzbDrone.addInitializer(function () { NzbDrone.Router = new NzbDrone.Router(); diff --git a/NzbDrone.Web/_backboneApp/Series/EmptySeriesCollectionTemplate.html b/NzbDrone.Web/_backboneApp/Series/EmptySeriesCollectionTemplate.html new file mode 100644 index 000000000..0b54712fc --- /dev/null +++ b/NzbDrone.Web/_backboneApp/Series/EmptySeriesCollectionTemplate.html @@ -0,0 +1 @@ +No series found \ No newline at end of file diff --git a/NzbDrone.Web/_backboneApp/Series/SeriesCollectionView.js b/NzbDrone.Web/_backboneApp/Series/SeriesCollectionView.js index dab677063..a295dfc94 100644 --- a/NzbDrone.Web/_backboneApp/Series/SeriesCollectionView.js +++ b/NzbDrone.Web/_backboneApp/Series/SeriesCollectionView.js @@ -6,9 +6,12 @@ define(['app', 'Quality/QualityProfileCollection', 'Series/SeriesItemView'], fun itemViewContainer: 'tbody', template: 'Series/SeriesCollectionTemplate', qualityProfileCollection: qualityProfileCollection, + emptyView: NzbDrone.Series.EmptySeriesCollectionView, initialize: function () { this.collection = new NzbDrone.Series.SeriesCollection(); + //Todo: This caused the onRendered event to be trigger twice, which displays two empty collection messages + //http://stackoverflow.com/questions/13065176/backbone-marionette-composit-view-onrender-executing-twice this.collection.fetch(); this.qualityProfileCollection.fetch(); @@ -19,7 +22,6 @@ define(['app', 'Quality/QualityProfileCollection', 'Series/SeriesItemView'], fun table : '.x-series-table' }, - onItemRemoved: function() { this.ui.table.trigger('update'); @@ -84,5 +86,9 @@ define(['app', 'Quality/QualityProfileCollection', 'Series/SeriesItemView'], fun } } }); +}); +NzbDrone.Series.EmptySeriesCollectionView = Backbone.Marionette.CompositeView.extend({ + template: 'Series/EmptySeriesCollectionTemplate', + tagName: 'tr' }); \ No newline at end of file diff --git a/NzbDrone.Web/_backboneApp/Series/SeriesModel.js b/NzbDrone.Web/_backboneApp/Series/SeriesModel.js index b2b28946f..6dc10e9de 100644 --- a/NzbDrone.Web/_backboneApp/Series/SeriesModel.js +++ b/NzbDrone.Web/_backboneApp/Series/SeriesModel.js @@ -1,6 +1,4 @@ define(['app', 'Quality/QualityProfileCollection'], function (app, qualityProfileCollection) { - - NzbDrone.Series.SeriesModel = Backbone.Model.extend({ mutators: { @@ -33,8 +31,6 @@ } }, - - defaults: { episodeFileCount: 0, episodeCount: 0, diff --git a/NzbDrone.Web/_backboneApp/app.js b/NzbDrone.Web/_backboneApp/app.js index dd83d795d..e89d1cc7a 100644 --- a/NzbDrone.Web/_backboneApp/app.js +++ b/NzbDrone.Web/_backboneApp/app.js @@ -48,7 +48,6 @@ define('app', function () { ApiRoot: '/api' }; - window.NzbDrone.addInitializer(function () { console.log('starting application'); diff --git a/NzbDrone/NzbDrone.Console.csproj b/NzbDrone/NzbDrone.Console.csproj index e59b63af6..2dd5c15f4 100644 --- a/NzbDrone/NzbDrone.Console.csproj +++ b/NzbDrone/NzbDrone.Console.csproj @@ -74,13 +74,13 @@ C:\Users\Mark\AppData\Local\Temp\vs1A55.tmp\x86\Mono\ - + False - ..\packages\Autofac.2.6.3.862\lib\NET40\Autofac.dll + ..\packages\Autofac.3.0.1\lib\net40\Autofac.dll - + False - ..\packages\Autofac.2.6.3.862\lib\NET40\Autofac.Configuration.dll + ..\packages\Autofac.3.0.1\lib\net40\Autofac.Configuration.dll True