Patch/onedr0p 3 4 2017 (#1006)

* Fix link in History tab (#734)

* Fix iCal feed (#746)

* Removed DKSubs from hardcoded subs

* Fix searching all cut off unmet
This commit is contained in:
Devin Buhl
2017-03-04 11:40:38 -05:00
committed by GitHub
parent 3f05ef810e
commit 0f2234bcdc
11 changed files with 84 additions and 66 deletions
+2 -16
View File
@@ -2,9 +2,7 @@ var Marionette = require('marionette');
var Backgrid = require('backgrid');
var HistoryCollection = require('./HistoryCollection');
var EventTypeCell = require('../../Cells/EventTypeCell');
var MovieTitleCell = require('../../Cells/MovieTitleHistoryCell');
var EpisodeNumberCell = require('../../Cells/EpisodeNumberCell');
var EpisodeTitleCell = require('../../Cells/EpisodeTitleCell');
var MovieTitleCell = require('../../Cells/MovieTitleCell');
var HistoryQualityCell = require('./HistoryQualityCell');
var RelativeDateCell = require('../../Cells/RelativeDateCell');
var HistoryDetailsCell = require('./HistoryDetailsCell');
@@ -29,22 +27,10 @@ module.exports = Marionette.Layout.extend({
cellValue : 'this'
},
{
name : 'movies',
name : 'movie',
label : 'Movie Title',
cell : MovieTitleCell,
},
/*{
name : 'episode',
label : 'Episode',
cell : EpisodeNumberCell,
sortable : false
},
{
name : 'episode',
label : 'Episode Title',
cell : EpisodeTitleCell,
sortable : false
},*/
{
name : 'this',
label : 'Quality',
@@ -12,7 +12,6 @@
<ul class='legend-labels'>
<li class="legend-label"><span class="premiere" title="This Movie is still in cinemas and hasn't been released yet. Only poor qualities will be available"></span>In Cinemas</li>
<li class="legend-label"><span class="primary" title="This movie has only been announced yet."></span>Announced</li>
<!--<li class="legend-label"><span class="warning" title="Episode is currently airing"></span>On Air</li>-->
<li class="legend-label"><span class="purple" title="Movie is currently downloading"></span>Downloading</li>
<li class="legend-label"><span class="danger" title="Movie file has not been found"></span>Missing</li>
<li class="legend-label"><span class="success" title="Movie was downloaded and sorted"></span>Downloaded</li>
-12
View File
@@ -1,12 +0,0 @@
var TemplatedCell = require('./TemplatedCell');
module.exports = TemplatedCell.extend({
className : 'series-title-cell',
template : 'Cells/SeriesTitleTemplate',
render : function() {
this.$el.html('<a href="/movies/' + this.model.get("movie").get("titleSlug") +'">' + this.model.get("movie").get("title") + '</a>'); //Hack, but somehow handlebar helper does not work.
return this;
}
});
+2 -2
View File
@@ -185,7 +185,7 @@ module.exports = Marionette.Layout.extend({
CommandController.bindToCommand({
element : this.$('.x-search-cutoff'),
command : { name : 'missingMoviesSearch' }
command : { name : 'cutOffUnmetMoviesSearch' }
});
},
@@ -223,7 +223,7 @@ module.exports = Marionette.Layout.extend({
_searchMissing : function() {
if (window.confirm('Are you sure you want to search for {0} filtered missing movies?'.format(this.collection.state.totalRecords) +
'One API request to each indexer will be used for each movie. ' + 'This cannot be stopped once started.')) {
CommandController.Execute('missingMoviesSearch', { name : 'missingMoviesSearch',
CommandController.Execute('cutOffUnmetMoviesSearch', { name : 'cutOffUnmetMoviesSearch',
filterKey : this.collection.state.filterKey,
filterValue : this.collection.state.filterValue });
}