Merge branch 'pr/11963' into pr/11964

modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/Blogs/BlogPostAdminController.cs

@@ -63,7 +63,7 @@ public class BlogPostAdminController : CmsKitAdminController, IBlogPostAdminAppS
     }
     
     [HttpPost]
-    [Route("publish/{id}")]
+    [Route("{id}/publish")]
     [Authorize(CmsKitAdminPermissions.BlogPosts.Publish)]
     public virtual Task PublishAsync(Guid id)
     {
@@ -71,7 +71,7 @@ public class BlogPostAdminController : CmsKitAdminController, IBlogPostAdminAppS
     }
     
     [HttpPost]
-    [Route("draft/{id}")]
+    [Route("{id}/draft")]
     [Authorize(CmsKitAdminPermissions.BlogPosts.Update)]
     public virtual Task DraftAsync(Guid id)
     {

modules/cms-kit/src/Volo.CmsKit.Admin.Web/wwwroot/client-proxies/cms-kit-admin-proxy.js

@@ -393,7 +393,7 @@
 
     volo.cmsKit.admin.blogs.blogPostAdmin.publish = function(id, ajaxParams) {
       return abp.ajax($.extend(true, {
-        url: abp.appPath + 'api/cms-kit-admin/blogs/blog-posts/publish/' + id + '',
+        url: abp.appPath + 'api/cms-kit-admin/blogs/blog-posts/' + id + '/publish',
         type: 'POST',
         dataType: null
       }, ajaxParams));
@@ -401,7 +401,7 @@
 
     volo.cmsKit.admin.blogs.blogPostAdmin.draft = function(id, ajaxParams) {
       return abp.ajax($.extend(true, {
-        url: abp.appPath + 'api/cms-kit-admin/blogs/blog-posts/draft/' + id + '',
+        url: abp.appPath + 'api/cms-kit-admin/blogs/blog-posts/' + id + '/draft',
         type: 'POST',
         dataType: null
       }, ajaxParams));

modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json

@@ -181,6 +181,7 @@
     "BlogPostSendToReviewSuccessMessage": "The blog post \"{0}\" has been sent to admin review for publishing.",
     "HasBlogPostWaitingForReviewMessage": "You have a blog post waiting for review. Click to list.",
     "SelectAStatus": "Select a status",
-    "Status": "Status"
+    "Status": "Status",
+    "SelectAnAuthor": "Select an author"
   }
 }

modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/tr.json

@@ -180,6 +180,7 @@
     "BlogPostSendToReviewSuccessMessage": "\"{0}\" başlıklı gönderiyi yayınlamak için admin incelemesine gönderildi.",
     "HasBlogPostWaitingForReviewMessage": "Yayınlanmak için onay bekleyen blog postlar var! Listelemek için tıklayın.",
     "SelectAStatus": "Durum seçin",
-    "Status": "Durum"
+    "Status": "Durum",
+    "SelectAnAuthor": "Bir yazar seçin"
   }
 }

modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Blogs/EfCoreBlogPostRepository.cs

@@ -106,7 +106,9 @@ public class EfCoreBlogPostRepository : EfCoreRepository<CmsKitDbContext, BlogPo
 
     public async Task<List<CmsUser>> GetAuthorsHasBlogPosts(CancellationToken cancellationToken = default)
     {
-        return await (await GetDbContextAsync()).BlogPosts.Select(x => x.Author).Distinct()
+        return await (await GetDbContextAsync()).BlogPosts
+            .Where(x => x.Status == BlogPostStatus.Published)
+            .Select(x => x.Author).Distinct()
             .ToListAsync(GetCancellationToken(cancellationToken));
     }
     

modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/MongoBlogPostRepository.cs

@@ -110,9 +110,12 @@ public class MongoBlogPostRepository : MongoDbRepository<CmsKitMongoDbContext, B
 
     public async Task<List<CmsUser>> GetAuthorsHasBlogPosts(CancellationToken cancellationToken = default)
     {
-        var blogPostQueryable = (await GetQueryableAsync());
+        cancellationToken = GetCancellationToken(cancellationToken);
+        
+        var blogPostQueryable = (await GetQueryableAsync())
+            .Where(x => x.Status == BlogPostStatus.Published);
 
-        var usersQueryable = (await GetDbContextAsync()).Collection<CmsUser>().AsQueryable();
+        var usersQueryable = (await GetDbContextAsync(cancellationToken)).Collection<CmsUser>().AsQueryable();
 
         var queryable = blogPostQueryable
                         .Join(
@@ -123,7 +126,7 @@ public class MongoBlogPostRepository : MongoDbRepository<CmsKitMongoDbContext, B
                         .Select(s => s.user)
                         .Distinct();
 
-        return await AsyncExecuter.ToListAsync(queryable, GetCancellationToken(cancellationToken));
+        return await AsyncExecuter.ToListAsync(queryable, cancellationToken);
     }
 
     public virtual async Task<bool> HasBlogPostWaitingForReviewAsync(CancellationToken cancellationToken = default)