From 035c66403c7b08921281b49d01a3d48bc7fd6b60 Mon Sep 17 00:00:00 2001 From: malik masis Date: Wed, 10 Aug 2022 18:37:58 +0300 Subject: [PATCH] Added the removing home page feature --- .../CmsKit/Admin/Pages/PageAdminAppService.cs | 11 ++++++++--- .../Pages/CmsKit/Pages/index.js | 19 ++++++++----------- .../CmsKit/Localization/Resources/en.json | 4 ++-- .../CmsKit/Localization/Resources/tr.json | 6 +++--- 4 files changed, 21 insertions(+), 19 deletions(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Pages/PageAdminAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Pages/PageAdminAppService.cs index c6c7b614b3..ea89ced70d 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Pages/PageAdminAppService.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Pages/PageAdminAppService.cs @@ -87,10 +87,15 @@ public class PageAdminAppService : CmsKitAdminAppServiceBase, IPageAdminAppServi [Authorize(CmsKitAdminPermissions.Pages.SetAsHomePage)] public virtual async Task SetAsHomePageAsync(Guid id) { - await PageManager.SetHomePageAsFalseAsync(true); - var page = await PageRepository.GetAsync(id); - page.IsHomePage = true; + if (!page.IsHomePage) + { + await PageManager.SetHomePageAsFalseAsync(true); + page = await PageRepository.GetAsync(id); + } + + page.IsHomePage = !page.IsHomePage; ; + await PageRepository.UpdateAsync(page); } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/index.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/index.js index 4d3d5ba765..730c9b6b30 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/index.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/index.js @@ -51,18 +51,15 @@ $(function () { text: l('SetAsHomePage'), visible: abp.auth.isGranted('CmsKit.Pages.SetAsHomePage'), action: function (data) { - if (data.record.isHomePage === false) { - pagesService - .setAsHomePage(data.record.id) - .then(function () { + pagesService + .setAsHomePage(data.record.id) + .then(function () { - _dataTable.ajax.reload(); - abp.notify.success(l('CompletedSettingAsHomePage')); - }); - } - else { - abp.notify.warn(l('AlreadyHomePage')); - } + _dataTable.ajax.reload(); + data.record.isHomePage ? + abp.notify.warn(l('RemovedSettingAsHomePage')) + : abp.notify.success(l('CompletedSettingAsHomePage')); + }); } } ] diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json index 983023321a..4870abe237 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json @@ -189,9 +189,9 @@ "SelectAnAuthor": "Select an Author", "InThisDocument": "In This Document", "GoToTop": "Go To Top", - "SetAsHomePage": "Set As Home Page", + "SetAsHomePage": "Change Home Page Status", "CompletedSettingAsHomePage": "Set as home page", "IsHomePage": "Is Home Page", - "AlreadyHomePage": "Already set as home page" + "RemovedSettingAsHomePage": "Removed setting the home page" } } \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/tr.json b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/tr.json index bf02b689ce..70763aad47 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/tr.json +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/tr.json @@ -190,9 +190,9 @@ "Add": "Ekle", "AddWidget": "Widget Ekle", "PleaseConfigureWidgets": "Lütfen widget'leri yapılandırın", - "SetAsHomePage": "Ana sayfa Olarak Ayarla", - "CompletedSettingAsHomePage": "Ana sayfa olarak ayarlandı", + "SetAsHomePage": "Ana sayfa Durumunu Değiştir", + "CompletedSettingAsHomePage": "Ana Sayfa olarak ayarlandı", "IsHomePage": "Ana Sayfa Mı", - "AlreadyHomePage": "Önceden ana sayfa olarak ayarlı" + "RemovedSettingAsHomePage": "Ana sayfa ayarı kaldırıldı" } }