Skip to content

Add Blog management functionality to Store area and remove Admin store restrictions #623

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

Merged
KrzysztofPajak merged 12 commits into from
Sep 30, 2025
Merged

Add Blog management functionality to Store area and remove Admin store restrictions #623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
39550d7
Initial plan
Copilot Sep 22, 2025
1b7b786
Initial analysis complete - planning Blog management for Store area
Copilot Sep 22, 2025
406169c
Add Blog management functionality to Store area
Copilot Sep 22, 2025
9664d85
Remove store restrictions from Admin BlogController as requested
Copilot Sep 22, 2025
fede02c
Add missing BlogPostModel using directive to Store _ViewImports.cshtml
Copilot Sep 23, 2025
c7480d1
Fix GetAllBlogPosts method call parameter mismatch in Store BlogContr…
Copilot Sep 23, 2025
c6075f2
Refactor BlogController to reduce dependencies
KrzysztofPajak Sep 28, 2025
ad5a3c5
Refactor store filtering in BlogService
KrzysztofPajak Sep 29, 2025
7138874
Update permissions for StoreManager customer group
KrzysztofPajak Sep 29, 2025
9845f44
Fix async retrieval of blog posts in BlogController
KrzysztofPajak Sep 29, 2025
c35385c
Enhance blog management features and UI improvements
KrzysztofPajak Sep 29, 2025
84bf58a
Refactor BlogController for improved error handling
KrzysztofPajak Sep 29, 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
5 changes: 4 additions & 1 deletion src/Business/Grand.Business.Cms/Services/BlogService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,10 @@ public virtual async Task<IPagedList<BlogPost>> GetAllBlogPosts(string storeId =
}

if (!string.IsNullOrEmpty(storeId) && !_accessControlConfig.IgnoreStoreLimitations)
query = query.Where(b => b.Stores.Contains(storeId) || !b.LimitedToStores);
query = from p in query
where !p.LimitedToStores || p.Stores.Contains(storeId)
select p;

if (!string.IsNullOrEmpty(tag)) query = query.Where(x => x.Tags.Contains(tag));

query = query.OrderByDescending(b => b.CreatedOnUtc);
Expand Down
3 changes: 2 additions & 1 deletion src/Modules/Grand.Module.Installer/Extensions/PermissionExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,8 @@ public static IEnumerable<DefaultPermission> DefaultPermissions()
StandardPermission.ManageMerchandiseReturns,
StandardPermission.ManageCheckoutAttribute,
StandardPermission.ManageReports,
StandardPermission.ManageNews
StandardPermission.ManageNews,
StandardPermission.ManageBlog
]
},

Expand Down
92 changes: 6 additions & 86 deletions src/Web/Grand.Web.Admin/Controllers/BlogController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
using Grand.Business.Core.Interfaces.Common.Stores;
using Grand.Domain.Permissions;
using Grand.Domain.Seo;
using Grand.Infrastructure;
using Grand.Web.Admin.Extensions;
using Grand.Web.AdminShared.Extensions;
using Grand.Web.AdminShared.Extensions.Mapping;
using Grand.Web.AdminShared.Interfaces;
using Grand.Web.AdminShared.Models.Blogs;
Expand All @@ -31,8 +28,6 @@ public BlogController(
ILanguageService languageService,
ITranslationService translationService,
IStoreService storeService,
IContextAccessor contextAccessor,
IGroupService groupService,
IDateTimeService dateTimeService,
IPictureViewModelService pictureViewModelService,
SeoSettings seoSettings)
Expand All @@ -42,8 +37,6 @@ public BlogController(
_languageService = languageService;
_translationService = translationService;
_storeService = storeService;
_contextAccessor = contextAccessor;
_groupService = groupService;
_dateTimeService = dateTimeService;
_pictureViewModelService = pictureViewModelService;
_seoSettings = seoSettings;
Expand All @@ -58,8 +51,6 @@ public BlogController(
private readonly ILanguageService _languageService;
private readonly ITranslationService _translationService;
private readonly IStoreService _storeService;
private readonly IContextAccessor _contextAccessor;
private readonly IGroupService _groupService;
private readonly IDateTimeService _dateTimeService;
private readonly IPictureViewModelService _pictureViewModelService;
private readonly SeoSettings _seoSettings;
Expand Down Expand Up @@ -96,7 +87,8 @@ public async Task<IActionResult> Create()
ViewBag.AllLanguages = await _languageService.GetAllLanguages(true);
var model = new BlogPostModel {
//default values
AllowComments = true
AllowComments = true,
CreateDate = DateTime.UtcNow
};
//locales
await AddLocales(_languageService, model.Locales);
Expand All @@ -111,8 +103,6 @@ public async Task<IActionResult> Create(BlogPostModel model, bool continueEditin
{
if (ModelState.IsValid)
{
if (await _groupService.IsStoreManager(_contextAccessor.WorkContext.CurrentCustomer))
model.Stores = [_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId];
var blogPost = await _blogViewModelService.InsertBlogPostModel(model);
Success(_translationService.GetResource("Admin.Content.Blog.BlogPosts.Added"));
return continueEditing ? RedirectToAction("Edit", new { id = blogPost.Id }) : RedirectToAction("List");
Expand All @@ -132,21 +122,6 @@ public async Task<IActionResult> Edit(string id)
//No blog post found with the specified id
return RedirectToAction("List");

if (await _groupService.IsStoreManager(_contextAccessor.WorkContext.CurrentCustomer))
{
if (!blogPost.LimitedToStores || (blogPost.LimitedToStores &&
blogPost.Stores.Contains(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId) &&
blogPost.Stores.Count > 1))
{
Warning(_translationService.GetResource("Admin.Content.Blog.BlogPosts.Permissions"));
}
else
{
if (!blogPost.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))
return RedirectToAction("List");
}
}

ViewBag.AllLanguages = await _languageService.GetAllLanguages(true);
var model = blogPost.ToModel(_dateTimeService);
//locales
Expand All @@ -173,15 +148,8 @@ public async Task<IActionResult> Edit(BlogPostModel model, bool continueEditing)
//No blog post found with the specified id
return RedirectToAction("List");

if (await _groupService.IsStoreManager(_contextAccessor.WorkContext.CurrentCustomer))
if (!blogPost.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))
return RedirectToAction("Edit", new { id = blogPost.Id });

if (ModelState.IsValid)
{
if (await _groupService.IsStoreManager(_contextAccessor.WorkContext.CurrentCustomer))
model.Stores = [_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId];

blogPost = await _blogViewModelService.UpdateBlogPostModel(model, blogPost);

Success(_translationService.GetResource("Admin.Content.Blog.BlogPosts.Updated"));
Expand Down Expand Up @@ -222,10 +190,6 @@ public async Task<IActionResult> Delete(string id)
//No blog post found with the specified id
return RedirectToAction("List");

if (await _groupService.IsStoreManager(_contextAccessor.WorkContext.CurrentCustomer))
if (!blogPost.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))
return RedirectToAction("Edit", new { id = blogPost.Id });

if (ModelState.IsValid)
{
await _blogService.DeleteBlogPost(blogPost);
Expand Down Expand Up @@ -295,7 +259,7 @@ public IActionResult CategoryList()
[HttpPost]
public async Task<IActionResult> CategoryList(DataSourceRequest command)
{
var categories = await _blogService.GetAllBlogCategories(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId);
var categories = await _blogService.GetAllBlogCategories("");
var gridModel = new DataSourceResult {
Data = categories,
Total = categories.Count
Expand All @@ -321,9 +285,6 @@ public async Task<IActionResult> CategoryCreate(BlogCategoryModel model, bool co
{
if (ModelState.IsValid)
{
if (await _groupService.IsStoreManager(_contextAccessor.WorkContext.CurrentCustomer))
model.Stores = [_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId];

var blogCategory = model.ToEntity();
blogCategory.SeName = SeoExtensions.GetSeName(
string.IsNullOrEmpty(blogCategory.SeName) ? blogCategory.Name : blogCategory.SeName,
Expand Down Expand Up @@ -352,22 +313,6 @@ public async Task<IActionResult> CategoryEdit(string id)
//No blog post found with the specified id
return RedirectToAction("CategoryList");

if (await _groupService.IsStoreManager(_contextAccessor.WorkContext.CurrentCustomer))
{
if (!blogCategory.LimitedToStores || (blogCategory.LimitedToStores &&
blogCategory.Stores.Contains(
_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId) &&
blogCategory.Stores.Count > 1))
{
Warning(_translationService.GetResource("Admin.Content.Blog.BlogCategory.Permissions"));
}
else
{
if (!blogCategory.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))
return RedirectToAction("List");
}
}

ViewBag.AllLanguages = await _languageService.GetAllLanguages(true);
var model = blogCategory.ToModel();
//locales
Expand All @@ -388,15 +333,8 @@ public async Task<IActionResult> CategoryEdit(BlogCategoryModel model, bool cont
//No blog post found with the specified id
return RedirectToAction("CategoryList");

if (await _groupService.IsStoreManager(_contextAccessor.WorkContext.CurrentCustomer))
if (!blogCategory.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))
return RedirectToAction("CategoryEdit", new { id = blogCategory.Id });

if (ModelState.IsValid)
{
if (await _groupService.IsStoreManager(_contextAccessor.WorkContext.CurrentCustomer))
model.Stores = [_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId];

blogCategory = model.ToEntity(blogCategory);
blogCategory.SeName = SeoExtensions.GetSeName(
string.IsNullOrEmpty(blogCategory.SeName) ? blogCategory.Name : blogCategory.SeName,
Expand Down Expand Up @@ -436,10 +374,6 @@ public async Task<IActionResult> CategoryDelete(string id)
//No blog post found with the specified id
return RedirectToAction("CategoryList");

if (await _groupService.IsStoreManager(_contextAccessor.WorkContext.CurrentCustomer))
if (!blogcategory.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))
return RedirectToAction("CategoryEdit", new { id = blogcategory.Id });

if (ModelState.IsValid)
{
await _blogService.DeleteBlogCategory(blogcategory);
Expand Down Expand Up @@ -488,10 +422,6 @@ public async Task<IActionResult> CategoryPostDelete(string categoryId, string id
if (blogCategory == null)
return ErrorForKendoGridJson("blogCategory no exists");

if (await _groupService.IsStoreManager(_contextAccessor.WorkContext.CurrentCustomer))
if (!blogCategory.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))
return ErrorForKendoGridJson("blogCategory no permission");

if (ModelState.IsValid)
{
var post = blogCategory.BlogPosts.FirstOrDefault(x => x.Id == id);
Expand All @@ -512,12 +442,8 @@ public async Task<IActionResult> BlogPostAddPopup(string categoryId)
{
var model = new AddBlogPostCategoryModel();
//stores
var storeId = _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId;

model.AvailableStores.Add(new SelectListItem
{ Text = _translationService.GetResource("Admin.Common.All"), Value = " " });
foreach (var s in (await _storeService.GetAllStores()).Where(x =>
x.Id == storeId || string.IsNullOrWhiteSpace(storeId)))
model.AvailableStores.Add(new SelectListItem { Text = _translationService.GetResource("Admin.Common.All"), Value = " " });
foreach (var s in await _storeService.GetAllStores())
model.AvailableStores.Add(new SelectListItem { Text = s.Shortcut, Value = s.Id });
model.CategoryId = categoryId;
return View(model);
Expand All @@ -529,9 +455,6 @@ public async Task<IActionResult> BlogPostAddPopupList(DataSourceRequest command,
{
var gridModel = new DataSourceResult();

if (await _groupService.IsStoreManager(_contextAccessor.WorkContext.CurrentCustomer))
model.SearchStoreId = _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId;

var posts = await _blogService.GetAllBlogPosts(model.SearchStoreId, blogPostName: model.SearchBlogTitle,
pageIndex: command.Page - 1, pageSize: command.PageSize);
gridModel.Data = posts.Select(x => new { x.Id, Name = x.Title });
Expand All @@ -550,7 +473,7 @@ public async Task<IActionResult> BlogPostAddPopup(AddBlogPostCategoryModel model
if (blogCategory != null)
foreach (var id in model.SelectedBlogPostIds)
{
var post = _blogService.GetBlogPostById(id);
var post = await _blogService.GetBlogPostById(id);
if (post != null)
if (!blogCategory.BlogPosts.Any(x => x.BlogPostId == id))
{
Expand Down Expand Up @@ -594,9 +517,6 @@ public async Task<IActionResult> CommentDelete(string id)
throw new ArgumentException("No comment found with the specified id");

var blogPost = await _blogService.GetBlogPostById(comment.BlogPostId);
if (await _groupService.IsStoreManager(_contextAccessor.WorkContext.CurrentCustomer))
if (!blogPost.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))
return ErrorForKendoGridJson("blogPost no permission");

if (ModelState.IsValid)
{
Expand Down
Loading