Merge pull request #24052 from abpframework/volo-issue-20584

CMS Kit Blogging enhancements

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Index.cshtml

@@ -38,7 +38,7 @@
             <abp-row>
                 <abp-column size="_2">
                     <select id="StatusSelect" class="form-select">
-                        <option value="">@L["SelectAStatus"]</option>
+                        <option value="">@L["AllPosts"]</option>
                         @foreach (var status in (BlogPostStatus[]) Enum.GetValues(typeof(BlogPostStatus)))
                         {
                             <option value="@((int)status)">@L["CmsKit.BlogPost.Status." + (int)status]</option>

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/index.js

@@ -31,7 +31,7 @@ $(function () {
         scrollCollapse: true,
         scrollX: true,
         ordering: true,
-        order: [[2, "desc"]],
+        order: [[4, "desc"]],
         ajax: abp.libs.datatables.createAjax(blogsService.getList, getFilter),
         columnDefs: [
             {
@@ -155,6 +155,10 @@ $(function () {
         dataTable.ajax.reloadEx();
     });
     
+    $statusFilter.on('change', function () {
+        dataTable.ajax.reloadEx();
+    });
+    
     $('#AbpContentToolbar button[name=CreateBlogPost]').on('click', function (e) {
         e.preventDefault();
         window.location.href = "BlogPosts/Create"

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Blogs/FeaturesModal.cshtml.cs

@@ -31,6 +31,9 @@ public class FeaturesModalModel : CmsKitAdminPageModel
     {
         var blogFeatureDtos = await BlogFeatureAdminAppService.GetListAsync(BlogId);
 
+        //Sort by localized feature name
+        blogFeatureDtos.Sort((x, y) => string.Compare(L[x.FeatureName].Value, L[y.FeatureName].Value, StringComparison.CurrentCultureIgnoreCase));
+
         Items = ObjectMapper.Map<List<BlogFeatureDto>, List<BlogFeatureViewModel>>(blogFeatureDtos);
     }
 

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

@@ -262,5 +262,6 @@
     "SelectAnBlogToAssign": "حدد مدونة لتعيين مشاركات المدونة إليها",
     "DeleteAllBlogPostsOfThisBlog": "حذف جميع مشاركات المدونة",
     "RequiredPermissionName": "اسم الإذن المطلوب",
+    "AllPosts": "جميع المشاركات"
   }
 }

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

@@ -280,6 +280,7 @@
     "AssignBlogPostsToOtherBlog": "Přiřaďte blogové příspěvky k jinému blogu",
     "SelectAnBlogToAssign": "Vyberte blog, ke kterému chcete přiřadit blogové příspěvky",
     "DeleteAllBlogPostsOfThisBlog": "Smazat všechny blogové příspěvky tohoto blogu",
-    "RequiredPermissionName": "Je vyžadováno oprávnění"
+    "RequiredPermissionName": "Je vyžadováno oprávnění",
+    "AllPosts": "Všechny příspěvky"
   }
 }

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

@@ -168,6 +168,7 @@
     "AssignBlogPostsToOtherBlog": "Blogbeiträge einem anderen Blog zuweisen",
     "SelectAnBlogToAssign": "Wählen Sie einen Blog aus, um Blogbeiträge zuzuweisen",
     "DeleteAllBlogPostsOfThisBlog": "Alle Blogbeiträge dieses Blogs löschen",
-    "RequiredPermissionName": "Erforderlicher Berechtigungsname"
+    "RequiredPermissionName": "Erforderlicher Berechtigungsname",
+    "AllPosts": "Alle Beiträge"
   }
 }

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

@@ -234,6 +234,7 @@
     "AssignBlogPostsToOtherBlog": "Blogbeiträge einem anderen Blog zuweisen",
     "SelectAnBlogToAssign": "Wählen Sie einen Blog aus, um Blogbeiträge zuzuweisen",
     "DeleteAllBlogPostsOfThisBlog": "Alle Blogbeiträge dieses Blogs löschen",
-    "RequiredPermissionName": "Erforderlicher Berechtigungsname"
+    "RequiredPermissionName": "Erforderlicher Berechtigungsname",
+    "AllPosts": "Alle Beiträge"
   }
 }

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

@@ -191,6 +191,7 @@
     "AssignBlogPostsToOtherBlog": "Ανάθεση αναρτήσεων ιστολογίου σε άλλο ιστολόγιο",
     "SelectAnBlogToAssign": "Επιλέξτε ένα ιστολόγιο για να αναθέσετε αναρτήσεις ιστολογίου",
     "DeleteAllBlogPostsOfThisBlog": "Διαγραφή όλων των αναρτήσεων ιστολογίου αυτού του ιστολογίου",
-    "RequiredPermissionName": "Απαιτούμενο όνομα δικαιώματος"
+    "RequiredPermissionName": "Απαιτούμενο όνομα δικαιώματος",
+    "AllPosts": "Όλες οι δημοσιεύσεις"
   }
 }

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

@@ -33,6 +33,7 @@
     "AssignBlogPostsToOtherBlog": "Assign blog posts to another blog",
     "SelectAnBlogToAssign": "Select a blog to assign",
     "DeleteAllBlogPostsOfThisBlog": "Delete all blog posts of this blog",
-    "RequiredPermissionName": "Required permission name"
+    "RequiredPermissionName": "Required permission name",
+    "AllPosts": "All posts"
   }
 }

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

@@ -279,6 +279,7 @@
     "AssignBlogPostsToOtherBlog": "Assign blog posts to another blog",
     "SelectAnBlogToAssign": "Select a blog to assign",
     "DeleteAllBlogPostsOfThisBlog": "Delete all blog posts of this blog",
-    "RequiredPermissionName": "Required permission name"
+    "RequiredPermissionName": "Required permission name",
+    "AllPosts": "All posts"
   }
 }

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

@@ -234,6 +234,7 @@
     "AssignBlogPostsToOtherBlog": "Asignar publicaciones de blog a otro blog",
     "SelectAnBlogToAssign": "Seleccione un blog para asignar publicaciones de blog",
     "DeleteAllBlogPostsOfThisBlog": "Eliminar todas las publicaciones de blog de este blog",
-    "RequiredPermissionName": "Nombre de permiso requerido"
+    "RequiredPermissionName": "Nombre de permiso requerido",
+    "AllPosts": "Todas las publicaciones"
   }
 }

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

@@ -190,6 +190,7 @@
     "AssignBlogPostsToOtherBlog": "پست های وبلاگ را به وبلاگ دیگری اختصاص دهید",
     "SelectAnBlogToAssign": "یک وبلاگ برای اختصاص دادن انتخاب کنید",
     "DeleteAllBlogPostsOfThisBlog": "تمام پست های وبلاگ این وبلاگ را حذف کنید",
-    "RequiredPermissionName": "نام مجوز مورد نیاز"
+    "RequiredPermissionName": "نام مجوز مورد نیاز",
+    "AllPosts": "همه پست ها"
   }
 }

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

@@ -234,6 +234,7 @@
     "AssignBlogPostsToOtherBlog": "Määritä blogiviestit toiseen blogiin",
     "SelectAnBlogToAssign": "Valitse blogi, johon haluat määrittää",
     "DeleteAllBlogPostsOfThisBlog": "Poista tämän blogin kaikki blogiviestit",
-    "RequiredPermissionName": "Tarvittava lupa"
+    "RequiredPermissionName": "Tarvittava lupa",
+    "AllPosts": "Kaikki viestit"
   }
 }

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

@@ -234,6 +234,7 @@
     "AssignBlogPostsToOtherBlog": "Attribuer des articles de blog à un autre blog",
     "SelectAnBlogToAssign": "Sélectionnez un blog à attribuer",
     "DeleteAllBlogPostsOfThisBlog": "Supprimer tous les articles de blog de ce blog",
-    "RequiredPermissionName": "Nom de permission requis"
+    "RequiredPermissionName": "Nom de permission requis",
+    "AllPosts": "Tous les messages"
   }
 }

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

@@ -234,6 +234,7 @@
     "AssignBlogPostsToOtherBlog": "अन्य ब्लॉग को ब्लॉग पोस्ट असाइन करें",
     "SelectAnBlogToAssign": "असाइन करने के लिए एक ब्लॉग चुनें",
     "DeleteAllBlogPostsOfThisBlog": "इस ब्लॉग के सभी ब्लॉग पोस्ट हटाएं",
-    "RequiredPermissionName": "आवश्यक अनुमति नाम"
+    "RequiredPermissionName": "आवश्यक अनुमति नाम",
+    "AllPosts": "सभी पोस्ट"
   }
 }

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

@@ -234,6 +234,7 @@
     "AssignBlogPostsToOtherBlog": "Dodijelite postove na blogu drugom blogu",
     "SelectAnBlogToAssign": "Odaberite blog za dodjelu",
     "DeleteAllBlogPostsOfThisBlog": "Izbrišite sve postove na blogu",
-    "RequiredPermissionName": "Potrebno ime dozvole"
+    "RequiredPermissionName": "Potrebno ime dozvole",
+    "AllPosts": "Sve objave"
   }
 }

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

@@ -234,6 +234,7 @@
     "AssignBlogPostsToOtherBlog": "Blogbejegyzések hozzárendelése egy másik bloghoz",
     "SelectAnBlogToAssign": "Válasszon egy blogot a hozzárendeléshez",
     "DeleteAllBlogPostsOfThisBlog": "Ez a művelet törli az összes blogbejegyzést ebből a blogból. Biztos vagy benne?",
-    "RequiredPermissionName": "Szükséges engedély neve"
+    "RequiredPermissionName": "Szükséges engedély neve",
+    "AllPosts": "Minden bejegyzés"
   }
 }

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

@@ -234,6 +234,7 @@
     "AssignBlogPostsToOtherBlog": "Úthluta bloggfærslum til annars bloggs",
     "SelectAnBlogToAssign": "Veldu blogg til að úthluta",
     "DeleteAllBlogPostsOfThisBlog": "Eyða öllum bloggfærslum þessa bloggs",
-    "RequiredPermissionName": "Nafn á nauðsynlegri leyfi"
+    "RequiredPermissionName": "Nafn á nauðsynlegri leyfi",
+    "AllPosts": "Allar færslur"
   }
 }

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

@@ -234,6 +234,7 @@
     "AssignBlogPostsToOtherBlog": "Assegna i post del blog ad un altro blog",
     "SelectAnBlogToAssign": "Seleziona un blog a cui assegnare i post del blog",
     "DeleteAllBlogPostsOfThisBlog": "Elimina tutti i post del blog di questo blog",
-    "RequiredPermissionName": "Nome del permesso richiesto"
+    "RequiredPermissionName": "Nome del permesso richiesto",
+    "AllPosts": "Tutti i post"
   }
 }

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

@@ -234,6 +234,7 @@
     "AssignBlogPostsToOtherBlog": "Wijs blogberichten toe aan een andere blog",
     "SelectAnBlogToAssign": "Selecteer een blog om toe te wijzen",
     "DeleteAllBlogPostsOfThisBlog": "Verwijder alle blogberichten van deze blog",
-    "RequiredPermissionName": "Vereiste toestemming"
+    "RequiredPermissionName": "Vereiste toestemming",
+    "AllPosts": "Alle berichten"
   }
 }

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

@@ -234,6 +234,7 @@
     "AssignBlogPostsToOtherBlog": "Przypisz posty na blogu do innego bloga",
     "SelectAnBlogToAssign": "Wybierz blog, do którego chcesz przypisać posty na blogu",
     "DeleteAllBlogPostsOfThisBlog": "Usuń wszystkie posty na blogu tego bloga",
-    "RequiredPermissionName": "Wymagana nazwa uprawnienia"
+    "RequiredPermissionName": "Wymagana nazwa uprawnienia",
+    "AllPosts": "Wszystkie posty"
   }
 }

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

@@ -234,6 +234,7 @@
     "AssignBlogPostsToOtherBlog": "Atribuir postagens de blog a outro blog",
     "SelectAnBlogToAssign": "Selecione um blog para atribuir",
     "DeleteAllBlogPostsOfThisBlog": "Excluir todas as postagens de blog deste blog",
-    "RequiredPermissionName": "Nome da permissão necessária"
+    "RequiredPermissionName": "Nome da permissão necessária",
+    "AllPosts": "Todas as postagens"
   }
 }

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

@@ -234,6 +234,7 @@
     "AssignBlogPostsToOtherBlog": "Atribuiţi postările de blog la alt blog",
     "SelectAnBlogToAssign": "Selectaţi un blog pentru a atribui postările de blog",
     "DeleteAllBlogPostsOfThisBlog": "Ştergeţi toate postările de blog ale acestui blog",
-    "RequiredPermissionName": "Numele permisiunii necesare"
+    "RequiredPermissionName": "Numele permisiunii necesare",
+    "AllPosts": "Toate postările"
   }
 }

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

@@ -234,6 +234,7 @@
     "AssignBlogPostsToOtherBlog": "Назначить сообщения в блоге другому блогу",
     "SelectAnBlogToAssign": "Выберите блог для назначения",
     "DeleteAllBlogPostsOfThisBlog": "Удалить все сообщения в блоге этого блога",
-    "RequiredPermissionName": "Имя требуемого разрешения"
+    "RequiredPermissionName": "Имя требуемого разрешения",
+    "AllPosts": "Все записи"
   }
 }

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

@@ -234,6 +234,7 @@
     "AssignBlogPostsToOtherBlog": "Priradiť blogové príspevky k inému blogu",
     "SelectAnBlogToAssign": "Vyberte blog, na ktorý chcete priradiť blogové príspevky",
     "DeleteAllBlogPostsOfThisBlog": "Zmazať všetky blogové príspevky tohto blogu",
-    "RequiredPermissionName": "Požadovaný názov oprávnenia"
+    "RequiredPermissionName": "Požadovaný názov oprávnenia",
+    "AllPosts": "Všetky príspevky"
   }
 }

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

@@ -234,6 +234,7 @@
     "AssignBlogPostsToOtherBlog": "Dodeli objave v blogu drugemu blogu",
     "SelectAnBlogToAssign": "Izberite blog, ki mu želite dodeliti objave",
     "DeleteAllBlogPostsOfThisBlog": "Izbriši vse objave v tem blogu",
-    "RequiredPermissionName": "Ime zahtevane dovoljenja"
+    "RequiredPermissionName": "Ime zahtevane dovoljenja",
+    "AllPosts": "Vse objave"
   }
 }

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

@@ -261,6 +261,7 @@
     "AssignBlogPostsToOtherBlog": "Tilldela blogginlägg till en annan blogg",
     "SelectAnBlogToAssign": "Välj en blogg att tilldela",
     "DeleteAllBlogPostsOfThisBlog": "Radera alla blogginlägg i denna blogg",
-    "RequiredPermissionName": "Nödvändigt behörighetsnamn"
+    "RequiredPermissionName": "Nödvändigt behörighetsnamn",
+    "AllPosts": "Alla inlägg"
   }
 }

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

@@ -225,6 +225,7 @@
     "AssignBlogPostsToOtherBlog": "Diğer bloglara blog yazıları atayın",
     "SelectAnBlogToAssign": "Atanacak bir blog seçin",
     "DeleteAllBlogPostsOfThisBlog": "Bu blogun tüm blog yazılarını sil",
-    "RequiredPermissionName": "Gerekli izin adı"
+    "RequiredPermissionName": "Gerekli izin adı",
+    "AllPosts": "Tüm gönderiler"
   }
 }

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

@@ -234,6 +234,7 @@
     "AssignBlogPostsToOtherBlog": "Gán bài đăng trên blog cho blog khác",
     "SelectAnBlogToAssign": "Chọn một blog để gán",
     "DeleteAllBlogPostsOfThisBlog": "Xóa tất cả bài đăng trên blog của blog này",
-    "RequiredPermissionName": "Tên quyền cần thiết"
+    "RequiredPermissionName": "Tên quyền cần thiết",
+    "AllPosts": "Tất cả bài viết"
   }
 }

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

@@ -234,6 +234,7 @@
     "AssignBlogPostsToOtherBlog": "将博客文章分配给其他博客",
     "SelectAnBlogToAssign": "选择要分配的博客",
     "DeleteAllBlogPostsOfThisBlog": "删除此博客的所有博客文章",
-    "RequiredPermissionName": "所需权限名称"
+    "RequiredPermissionName": "所需权限名称",
+    "AllPosts": "所有帖子"
   }
 }

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

@@ -234,6 +234,7 @@
     "AssignBlogPostsToOtherBlog": "將部落格文章分配給其他部落格",
     "SelectAnBlogToAssign": "選擇要分配的部落格",
     "DeleteAllBlogPostsOfThisBlog": "刪除此部落格的所有部落格文章",
-    "RequiredPermissionName": "所需權限名稱"
+    "RequiredPermissionName": "所需權限名稱",
+    "AllPosts": "所有文章"
   }
 }

modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml

@@ -130,16 +130,6 @@
     </div>
 
     <div class="col-md-2 d-sm-none d-md-block">
-        @if (Model.ViewModel.Author.Id == CurrentUser.Id)
-        {
-            <button id="deleteBlogPost" class="btn btn-danger">
-                <i class="fa fa-remove">
-                </i>
-                    @L["Delete"]
-            </button>
-
-            <hr />
-        }
         @if (isScrollIndexEnabled)
         {
             <div id="scroll-index" class="docs-inner-anchors mt-2">

modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/blogPost.js

@@ -1,16 +1,4 @@
 $(function () {
 
     let l = abp.localization.getResource("CmsKit");
-
-    $('#deleteBlogPost').on('click', '', function (e) {
-        abp.message.confirm(l("DeleteBlogPostMessage"), function (ok) {
-            if (ok) {
-                volo.cmsKit.public.blogs.blogPostPublic.delete(
-                    $('#BlogId').val()
-                ).then(function () {
-                    document.location.href = "/";
-                });
-            }
-        })
-    });
 });