Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge branch dev with rel-9.1 #22123

Merged
merged 12 commits into from
Feb 12, 2025
Merged

Merge branch dev with rel-9.1 #22123

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a6f5c1b
update: handling `access_token` event changes on multiple tabs
sumeyyeKurtulus Feb 3, 2025
9569065
Fix Blog post tag filtering problem
realLiangshiwei Feb 11, 2025
3cfad05
Update version to release 9.1.0-rc.2
skoc10 Feb 11, 2025
ea9eaec
Merge pull request #22114 from abpframework/skoc10-patch-1
ebicoglu Feb 11, 2025
8097cf7
Merge pull request #22066 from abpframework/issue-18890
yagmurcelk Feb 11, 2025
69817b3
Merge pull request #22113 from abpframework/cms-patch
oykuermann Feb 11, 2025
5867842
update: nullability and type checks on models
sumeyyeKurtulus Feb 11, 2025
afc6454
update: readability
sumeyyeKurtulus Feb 11, 2025
e996cf9
rollback: readability
sumeyyeKurtulus Feb 11, 2025
4b4e3c7
Merge pull request #22120 from abpframework/issue-22118
masum-ulu Feb 11, 2025
5b8adc5
Merge branch 'rel-9.1' into auto-merge/rel-9-0/3470
maliming Feb 11, 2025
fc15b3d
Merge pull request #22122 from abpframework/auto-merge/rel-9-0/3470
maliming Feb 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix Blog post tag filtering problem
  • Loading branch information
@realLiangshiwei
realLiangshiwei committed Feb 11, 2025
commit 95690651236a343a8d7c2399d68f4fcb6f2e625c
12 changes: 6 additions & 6 deletions ...cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Blogs/EfCoreBlogPostRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,14 @@ public virtual async Task<int> GetCountAsync(
BlogPostStatus? statusFilter = null,
CancellationToken cancellationToken = default)
{
List<string> entityIdFilters = null;
List<Guid> entityIdFilters = null;
if (tagId.HasValue)
{
entityIdFilters = await _entityTagManager.GetEntityIdsFilteredByTagAsync(tagId.Value, CurrentTenant.Id, cancellationToken);
entityIdFilters = (await _entityTagManager.GetEntityIdsFilteredByTagAsync(tagId.Value, CurrentTenant.Id, cancellationToken)).Select(Guid.Parse).ToList();
}

var queryable = (await GetDbSetAsync())
.WhereIf(entityIdFilters != null, x => entityIdFilters.Contains(x.Id.ToString()))
.WhereIf(entityIdFilters != null, x => entityIdFilters.Contains(x.Id))
.WhereIf(blogId.HasValue, x => x.BlogId == blogId)
.WhereIf(authorId.HasValue, x => x.AuthorId == authorId)
.WhereIf(statusFilter.HasValue, x => x.Status == statusFilter)
Expand All @@ -86,14 +86,14 @@ public virtual async Task<List<BlogPost>> GetListAsync(
var blogPostsDbSet = dbContext.Set<BlogPost>();
var usersDbSet = dbContext.Set<CmsUser>();

List<string> entityIdFilters = null;
List<Guid> entityIdFilters = null;
if (tagId.HasValue)
{
entityIdFilters = await _entityTagManager.GetEntityIdsFilteredByTagAsync(tagId.Value, CurrentTenant.Id, cancellationToken);
entityIdFilters = (await _entityTagManager.GetEntityIdsFilteredByTagAsync(tagId.Value, CurrentTenant.Id, cancellationToken)).Select(Guid.Parse).ToList();
}

var queryable = (await GetDbSetAsync())
.WhereIf(entityIdFilters != null, x => entityIdFilters.Contains(x.Id.ToString()))
.WhereIf(entityIdFilters != null, x => entityIdFilters.Contains(x.Id))
.WhereIf(blogId.HasValue, x => x.BlogId == blogId)
.WhereIf(!string.IsNullOrWhiteSpace(filter), x => x.Title.Contains(filter) || x.Slug.Contains(filter))
.WhereIf(authorId.HasValue, x => x.AuthorId == authorId)
Expand Down
Loading