AZEN-SGG/Kavita
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Last Shakeout before Release (#2253)

Browse source 
* [skip ci] Weblate Changes (#2250)

* [skip ci] Translated using Weblate (Korean)

Currently translated at 100.0% (1486 of 1486 strings)

Translation: Kavita/ui
Translate-URL: https://hosted.weblate.org/projects/kavita/ui/ko/

* [skip ci] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (1486 of 1486 strings)

Translation: Kavita/ui
Translate-URL: https://hosted.weblate.org/projects/kavita/ui/zh_Hans/

* Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (161 of 161 strings)

Translation: Kavita/backend
Translate-URL: https://hosted.weblate.org/projects/kavita/backend/zh_Hans/

* Translated using Weblate (Korean)

Currently translated at 100.0% (161 of 161 strings)

Translation: Kavita/backend
Translate-URL: https://hosted.weblate.org/projects/kavita/backend/ko/

* Translated using Weblate (Czech)

Currently translated at 100.0% (161 of 161 strings)

Translation: Kavita/backend
Translate-URL: https://hosted.weblate.org/projects/kavita/backend/cs/

* [skip ci] Translated using Weblate (Czech)

Currently translated at 15.7% (234 of 1486 strings)

Translation: Kavita/ui
Translate-URL: https://hosted.weblate.org/projects/kavita/ui/cs/

* [skip ci] Translated using Weblate (Spanish)

Currently translated at 88.5% (1316 of 1486 strings)

Translation: Kavita/ui
Translate-URL: https://hosted.weblate.org/projects/kavita/ui/es/

* Translated using Weblate (Spanish)

Currently translated at 100.0% (161 of 161 strings)

Translation: Kavita/backend
Translate-URL: https://hosted.weblate.org/projects/kavita/backend/es/

* [skip ci] Translated using Weblate (Dutch)

Currently translated at 72.2% (1073 of 1486 strings)

Translation: Kavita/ui
Translate-URL: https://hosted.weblate.org/projects/kavita/ui/nl/

* Translated using Weblate (Italian)

Currently translated at 100.0% (161 of 161 strings)

Translation: Kavita/backend
Translate-URL: https://hosted.weblate.org/projects/kavita/backend/it/

* [skip ci] Translated using Weblate (Italian)

Currently translated at 100.0% (1486 of 1486 strings)

Translation: Kavita/ui
Translate-URL: https://hosted.weblate.org/projects/kavita/ui/it/

---------

Co-authored-by: LeeWan1210 <dldhks456@live.com>
Co-authored-by: aleixcox <18121624@qq.com>
Co-authored-by: Jiří Heger <jiri.heger@gmail.com>
Co-authored-by: gallegonovato <fran-carro@hotmail.es>
Co-authored-by: Hans Kalisvaart <hans.kalisvaart@gmail.com>
Co-authored-by: Florestano Pepe <florestano.pepe@gmail.com>

* Fixed bookmark page not sorting and ordering correctly.

---------

Co-authored-by: Weblate (bot) <hosted@weblate.org>
Co-authored-by: LeeWan1210 <dldhks456@live.com>
Co-authored-by: aleixcox <18121624@qq.com>
Co-authored-by: Jiří Heger <jiri.heger@gmail.com>
Co-authored-by: gallegonovato <fran-carro@hotmail.es>
Co-authored-by: Hans Kalisvaart <hans.kalisvaart@gmail.com>
Co-authored-by: Florestano Pepe <florestano.pepe@gmail.com>
This commit is contained in:
Joe Milazzo 2023-09-03 06:42:55 -07:00 • committed by GitHub
parent 5a947fa525
commit ea4571b3d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 265 additions and 236 deletions
Download patch file Download diff file Expand all files Collapse all files

22
API/Data/Repositories/UserRepository.cs
View file

@ -383,13 +383,6 @@ public class UserRepository : IUserRepository
.OrderBy(x => x.Created)
.AsNoTracking();
var filterStatement = filter.Statements.FirstOrDefault(f => f.Field == FilterField.SeriesName);
if (filterStatement == null || string.IsNullOrWhiteSpace(filterStatement.Value))
return await query
.ProjectTo<BookmarkDto>(_mapper.ConfigurationProvider)
.ToListAsync();
var queryString = filterStatement.Value.ToNormalized();
var filterSeriesQuery = query.Join(_context.Series, b => b.SeriesId, s => s.Id,
(bookmark, series) => new BookmarkSeriesPair()
{
@ -397,6 +390,17 @@ public class UserRepository : IUserRepository
series = series
});
var filterStatement = filter.Statements.FirstOrDefault(f => f.Field == FilterField.SeriesName);
if (filterStatement == null || string.IsNullOrWhiteSpace(filterStatement.Value))
{
return await ApplyLimit(filterSeriesQuery
.Sort(filter.SortOptions)
.AsSplitQuery(), filter.LimitTo)
.ProjectTo<BookmarkDto>(_mapper.ConfigurationProvider)
.ToListAsync();
}
var queryString = filterStatement.Value.ToNormalized();
switch (filterStatement.Comparison)
{
case FilterComparison.Equal:
@ -429,6 +433,7 @@ public class UserRepository : IUserRepository
|| s.series.LocalizedName != queryString
|| s.series.SortName != queryString);
break;
case FilterComparison.MustContains:
case FilterComparison.NotContains:
case FilterComparison.GreaterThan:
case FilterComparison.GreaterThanEqual:
@ -443,8 +448,6 @@ public class UserRepository : IUserRepository
break;
}
return await ApplyLimit(filterSeriesQuery
.Sort(filter.SortOptions)
.AsSplitQuery(), filter.LimitTo)
@ -458,6 +461,7 @@ public class UserRepository : IUserRepository
return limit <= 0 ? query : query.Take(limit);
}
/// <summary>
/// Fetches the UserId by API Key. This does not include any extra information
/// </summary>