github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-08-23 14:55:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed: Radarr not loading with an invalid sort key.

Browse source
This commit is contained in:
Leonardo Galli 2018-04-17 22:06:14 +02:00
commit 30796388b0
3 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/NzbDrone.Core/Datastore/BasicRepository.cs
View file

@ -259,7 +259,7 @@ namespace NzbDrone.Core.Datastore
protected virtual SortBuilder<TModel> GetPagedQuery(QueryBuilder<TModel> query, PagingSpec<TModel> pagingSpec) protected virtual SortBuilder<TModel> GetPagedQuery(QueryBuilder<TModel> query, PagingSpec<TModel> pagingSpec)
{ {
return query.Where(pagingSpec.FilterExpression) return query.Where(pagingSpec.FilterExpression)
.OrderBy(pagingSpec.OrderByClause(), pagingSpec.ToSortDirection()); .OrderBy(pagingSpec.OrderByClause(x => x.Id), pagingSpec.ToSortDirection());
} }
protected void ModelCreated(TModel model) protected void ModelCreated(TModel model)

16
src/NzbDrone.Core/Datastore/Extensions/PagingSpecExtensions.cs
View file

@ -6,9 +6,21 @@ namespace NzbDrone.Core.Datastore.Extensions
{ {
public static class PagingSpecExtensions public static class PagingSpecExtensions
{ {
public static Expression<Func<TModel, object>> OrderByClause<TModel>(this PagingSpec<TModel> pagingSpec) public static Expression<Func<TModel, object>> OrderByClause<TModel>(this PagingSpec<TModel> pagingSpec, Expression<Func<TModel, object>> defaultExpression = null)
{ {
return CreateExpression<TModel>(pagingSpec.SortKey); try
{
return CreateExpression<TModel>(pagingSpec.SortKey);
}
catch
{
if (defaultExpression == null)
{
return x => x;
}
return defaultExpression;
}
} }
public static int PagingOffset<TModel>(this PagingSpec<TModel> pagingSpec) public static int PagingOffset<TModel>(this PagingSpec<TModel> pagingSpec)

4
src/NzbDrone.Core/Movies/MovieRepository.cs
View file

@ -161,7 +161,7 @@ namespace NzbDrone.Core.Movies
{ {
return Query.Where(pagingSpec.FilterExpression) return Query.Where(pagingSpec.FilterExpression)
.AndWhere(m => m.MovieFileId == 0) .AndWhere(m => m.MovieFileId == 0)
.OrderBy(pagingSpec.OrderByClause(), pagingSpec.ToSortDirection()) .OrderBy(pagingSpec.OrderByClause(x => x.SortTitle), pagingSpec.ToSortDirection())
.Skip(pagingSpec.PagingOffset()) .Skip(pagingSpec.PagingOffset())
.Take(pagingSpec.PageSize); .Take(pagingSpec.PageSize);
} }
@ -179,7 +179,7 @@ namespace NzbDrone.Core.Movies
return Query.Where(pagingSpec.FilterExpression) return Query.Where(pagingSpec.FilterExpression)
.AndWhere(m => m.MovieFileId != 0) .AndWhere(m => m.MovieFileId != 0)
.AndWhere(BuildQualityCutoffWhereClause(qualitiesBelowCutoff)) .AndWhere(BuildQualityCutoffWhereClause(qualitiesBelowCutoff))
.OrderBy(pagingSpec.OrderByClause(), pagingSpec.ToSortDirection()) .OrderBy(pagingSpec.OrderByClause(x => x.SortTitle), pagingSpec.ToSortDirection())
.Skip(pagingSpec.PagingOffset()) .Skip(pagingSpec.PagingOffset())
.Take(pagingSpec.PageSize); .Take(pagingSpec.PageSize);
} }