mirror of
https://github.com/lidarr/lidarr.git
synced 2025-08-23 06:45:19 -07:00
needed to pass the filterType, received the filterType and handle
the filterType
This commit is contained in:
parent
b492fece6c
commit
ff11388009
5 changed files with 32 additions and 3 deletions
|
@ -13,6 +13,7 @@ namespace NzbDrone.Api
|
||||||
public SortDirection SortDirection { get; set; }
|
public SortDirection SortDirection { get; set; }
|
||||||
public string FilterKey { get; set; }
|
public string FilterKey { get; set; }
|
||||||
public string FilterValue { get; set; }
|
public string FilterValue { get; set; }
|
||||||
|
public string FilterType { get; set; }
|
||||||
public int TotalRecords { get; set; }
|
public int TotalRecords { get; set; }
|
||||||
public List<TResource> Records { get; set; }
|
public List<TResource> Records { get; set; }
|
||||||
}
|
}
|
||||||
|
|
|
@ -252,8 +252,15 @@ namespace NzbDrone.Api.REST
|
||||||
{
|
{
|
||||||
pagingResource.FilterValue = Request.Query.FilterValue.ToString();
|
pagingResource.FilterValue = Request.Query.FilterValue.ToString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (Request.Query.FilterType != null)
|
||||||
|
{
|
||||||
|
pagingResource.FilterType = Request.Query.FilterType.ToString();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
return pagingResource;
|
return pagingResource;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -140,6 +140,24 @@ namespace NzbDrone.Api.Movie
|
||||||
pagingSpec.FilterExpression = v => v.MovieFileId == 0;
|
pagingSpec.FilterExpression = v => v.MovieFileId == 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (pagingResource.FilterKey == "title")
|
||||||
|
{
|
||||||
|
if (pagingResource.FilterType == "contains")
|
||||||
|
{
|
||||||
|
if (pagingResource.FilterValue == string.Empty || pagingResource.FilterValue == null)
|
||||||
|
{
|
||||||
|
pagingSpec.FilterExpression = v => true;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
pagingSpec.FilterExpression = v => v.CleanTitle.Contains(pagingResource.FilterValue);
|
||||||
|
}
|
||||||
|
} else
|
||||||
|
{
|
||||||
|
pagingSpec.FilterExpression = v => v.CleanTitle == pagingResource.FilterValue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return ApplyToPage(_moviesService.Paged, pagingSpec, MovieResourceMapper.ToResource);
|
return ApplyToPage(_moviesService.Paged, pagingSpec, MovieResourceMapper.ToResource);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -4,6 +4,7 @@ var Marionette = require('marionette');
|
||||||
var Backgrid = require('backgrid');
|
var Backgrid = require('backgrid');
|
||||||
var MoviesCollection = require('../../Movies/MoviesCollection');
|
var MoviesCollection = require('../../Movies/MoviesCollection');
|
||||||
var SelectRow = require('./SelectMovieRow');
|
var SelectRow = require('./SelectMovieRow');
|
||||||
|
var FullMovieCollection = require('../../Movies/FullMovieCollection');
|
||||||
|
|
||||||
module.exports = Marionette.Layout.extend({
|
module.exports = Marionette.Layout.extend({
|
||||||
template : 'ManualImport/Movie/SelectMovieLayoutTemplate',
|
template : 'ManualImport/Movie/SelectMovieLayoutTemplate',
|
||||||
|
@ -32,7 +33,7 @@ module.exports = Marionette.Layout.extend({
|
||||||
],
|
],
|
||||||
|
|
||||||
initialize : function() {
|
initialize : function() {
|
||||||
this.movieCollection = MoviesCollection.clone();
|
this.movieCollection = FullMovieCollection;
|
||||||
this._setModelCollection();
|
this._setModelCollection();
|
||||||
|
|
||||||
this.listenTo(this.movieCollection, 'row:selected', this._onSelected);
|
this.listenTo(this.movieCollection, 'row:selected', this._onSelected);
|
||||||
|
|
|
@ -67,12 +67,14 @@ module.exports = function() {
|
||||||
|
|
||||||
_.extend(this.prototype.state, {
|
_.extend(this.prototype.state, {
|
||||||
filterKey : null,
|
filterKey : null,
|
||||||
filterValue : null
|
filterValue : null,
|
||||||
|
filterType : null
|
||||||
});
|
});
|
||||||
|
|
||||||
_.extend(this.prototype.queryParams, {
|
_.extend(this.prototype.queryParams, {
|
||||||
filterKey : 'filterKey',
|
filterKey : 'filterKey',
|
||||||
filterValue : 'filterValue'
|
filterValue : 'filterValue',
|
||||||
|
filterType : 'filterType'
|
||||||
});
|
});
|
||||||
|
|
||||||
return this;
|
return this;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue