1
0
mirror of https://github.com/Radarr/Radarr.git synced 2026-04-25 22:37:27 -04:00

Update blacklist to work with movies (#1089)

* Update BlacklistService

* Update HistoryService, HistoryRepo and History

* Update UI in Blacklists to movies

* set the movie model so the movie title prints in blacklist

* Would be working if I implemented the Event Handler for MovieFileDeleted
This commit is contained in:
Devin Buhl
2017-03-09 18:45:08 -05:00
committed by GitHub
parent ae0fc019e5
commit 1a4fb6e7bb
12 changed files with 212 additions and 142 deletions
@@ -26,7 +26,7 @@ var Collection = PageableCollection.extend({
},
sortMappings : {
'series' : { sortKey : 'series.sortTitle' }
'movie' : { sortKey : 'movie.title' }
},
parseState : function(resp) {
+4 -4
View File
@@ -2,7 +2,7 @@ var vent = require('vent');
var Marionette = require('marionette');
var Backgrid = require('backgrid');
var BlacklistCollection = require('./BlacklistCollection');
var SeriesTitleCell = require('../../Cells/SeriesTitleCell');
var MovieTitleCell = require('../../Cells/MovieTitleCell');
var QualityCell = require('../../Cells/QualityCell');
var RelativeDateCell = require('../../Cells/RelativeDateCell');
var BlacklistActionsCell = require('./BlacklistActionsCell');
@@ -21,9 +21,9 @@ module.exports = Marionette.Layout.extend({
columns : [
{
name : 'series',
label : 'Series',
cell : SeriesTitleCell
name : 'movie',
label : 'Movie Title',
cell : MovieTitleCell
},
{
name : 'sourceTitle',
+17 -11
View File
@@ -1,17 +1,23 @@
var Backbone = require('backbone');
var SeriesCollection = require('../../Series/SeriesCollection');
var SeriesModel = require('../../Series/SeriesModel');
var EpisodeModel = require('../../Series/EpisodeModel');
var MovieModel = require('../../Movies/MovieModel');
var MoviesCollection = require('../../Movies/FullMovieCollection');
module.exports = Backbone.Model.extend({
//Hack to deal with Backbone 1.0's bug
initialize : function() {
this.url = function() {
return this.collection.url + '/' + this.get('id');
};
},
parse : function(model) {
model.series = SeriesCollection.get(model.seriesId);
if (model.series) {
model.series = new SeriesModel(model.series);
model.episode = new EpisodeModel(model.episode);
model.episode.set('series', model.series);
}
//if (model.movie) {
// model.movie = new MovieModel(model.movie);
//}
model.movie = MoviesCollection.get(model.movieId);
return model;
}
});
});
+1 -1
View File
@@ -45,7 +45,7 @@ var Collection = PageableCollection.extend({
],
'deleted' : [
'eventType',
'5'
'6'
]
},