Skip to content

Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.

ARCH-001 Phase 16: News controller/service consolidation (Admin/Store) + Comments tab fix (#810)

Krzysztof Pajak92bce57d31d1
diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseNewsControllerTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseNewsControllerTests.cs
new file mode 100644
index 000000000..f1834e997
--- /dev/null
+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseNewsControllerTests.cs
@@ -0,0 +1,421 @@
+using Grand.Business.Core.Interfaces.Cms;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Domain.News;
+using Grand.Infrastructure.Mapper;
+using Grand.Mapping;
+using Grand.Web.AdminShared.Controllers;
+using Grand.Web.AdminShared.Interfaces;
+using Grand.Web.AdminShared.Mapper;
+using Grand.Web.AdminShared.Models.News;
+using Grand.Web.Common.DataSource;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.Extensions.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+
+namespace Grand.Web.Admin.Tests.Controllers;
+
+// Characterization tests for the merged News access-check behavior (ARCH-001 News consolidation).
+[TestClass]
+public class BaseNewsControllerTests
+{
+ private class TestNewsController(
+ INewsViewModelService newsViewModelService,
+ INewsService newsService,
+ ILanguageService languageService,
+ ITranslationService translationService,
+ IStoreService storeService,
+ IDateTimeService dateTimeService,
+ IAdminDataScope<NewsItem> scope)
+ : BaseNewsController(newsViewModelService, newsService, languageService, translationService,
+ storeService, dateTimeService, scope);
+
+ private TestNewsController _controller;
+ private Mock<INewsViewModelService> _newsViewModelServiceMock;
+ private Mock<INewsService> _newsServiceMock;
+ private Mock<ITranslationService> _translationServiceMock;
+ private Mock<IAdminDataScope<NewsItem>> _scopeMock;
+
+ [TestInitialize]
+ public void Setup()
+ {
+ var mapperConfig = new MapperConfiguration(cfg => cfg.AddProfile<NewsItemProfile>());
+ AutoMapperConfig.Init(mapperConfig);
+
+ _newsViewModelServiceMock = new Mock<INewsViewModelService>();
+ _newsServiceMock = new Mock<INewsService>();
+ _translationServiceMock = new Mock<ITranslationService>();
+ _translationServiceMock.Setup(t => t.GetResource(It.IsAny<string>())).Returns("resource");
+
+ _scopeMock = new Mock<IAdminDataScope<NewsItem>>();
+ _scopeMock.Setup(s => s.DefaultStoreId).Returns((string)null);
+
+ var languageServiceMock = new Mock<ILanguageService>();
+ languageServiceMock.Setup(l => l.GetAllLanguages(true, It.IsAny<string>()))
+ .ReturnsAsync(new List<Grand.Domain.Localization.Language>());
+
+ var storeServiceMock = new Mock<IStoreService>();
+ storeServiceMock.Setup(s => s.GetAllStores()).ReturnsAsync(new List<Grand.Domain.Stores.Store>());
+
+ _controller = new TestNewsController(
+ _newsViewModelServiceMock.Object,
+ _newsServiceMock.Object,
+ languageServiceMock.Object,
+ _translationServiceMock.Object,
+ storeServiceMock.Object,
+ new Mock<IDateTimeService>().Object,
+ _scopeMock.Object);
+
+ var httpContext = new DefaultHttpContext();
+ var loggerFactoryMock = new Mock<ILoggerFactory>();
+ loggerFactoryMock.Setup(l => l.CreateLogger(It.IsAny<string>())).Returns(new Mock<ILogger>().Object);
+ var urlHelperFactoryMock = new Mock<IUrlHelperFactory>();
+ urlHelperFactoryMock.Setup(f => f.GetUrlHelper(It.IsAny<ActionContext>())).Returns(new Mock<IUrlHelper>().Object);
+ var requestServicesMock = new Mock<IServiceProvider>();
+ requestServicesMock.Setup(s => s.GetService(typeof(ILoggerFactory))).Returns(loggerFactoryMock.Object);
+ requestServicesMock.Setup(s => s.GetService(typeof(IUrlHelperFactory))).Returns(urlHelperFactoryMock.Object);
+ httpContext.RequestServices = requestServicesMock.Object;
+ _controller.ControllerContext = new ControllerContext { HttpContext = httpContext };
+ _controller.TempData = new TempDataDictionary(httpContext, new Mock<ITempDataProvider>().Object);
+ }
+
+ [TestMethod]
+ public async Task ListPost_UsesSharedPrepareNewsItemModel_NotGetAllNewsDirectly()
+ {
+ _newsViewModelServiceMock
+ .Setup(v => v.PrepareNewsItemModel(It.IsAny<NewsItemListModel>(), 1, 10))
+ .ReturnsAsync((new List<NewsItemModel>(), 0));
+
+ await _controller.List(new DataSourceRequest { Page = 1, PageSize = 10 }, new NewsItemListModel());
+
+ _newsViewModelServiceMock.Verify(v => v.PrepareNewsItemModel(It.IsAny<NewsItemListModel>(), 1, 10), Times.Once);
+ _newsServiceMock.Verify(s => s.GetAllNews(It.IsAny<string>(), It.IsAny<int>(), It.IsAny<int>(),
+ It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<string>()), Times.Never);
+ }
+
+ [TestMethod]
+ public async Task ListPost_ForcesScopeDefaultStoreId()
+ {
+ _scopeMock.Setup(s => s.DefaultStoreId).Returns("store-1");
+ _newsViewModelServiceMock
+ .Setup(v => v.PrepareNewsItemModel(It.IsAny<NewsItemListModel>(), 1, 10))
+ .ReturnsAsync((new List<NewsItemModel>(), 0));
+
+ var model = new NewsItemListModel { SearchStoreId = "attacker-supplied" };
+ await _controller.List(new DataSourceRequest { Page = 1, PageSize = 10 }, model);
+
+ Assert.AreEqual("store-1", model.SearchStoreId);
+ }
+
+ [TestMethod]
+ public async Task ListPost_GlobalScope_LeavesSubmittedSearchStoreIdUntouched()
+ {
+ _scopeMock.Setup(s => s.DefaultStoreId).Returns((string)null);
+ _newsViewModelServiceMock
+ .Setup(v => v.PrepareNewsItemModel(It.IsAny<NewsItemListModel>(), 1, 10))
+ .ReturnsAsync((new List<NewsItemModel>(), 0));
+
+ var model = new NewsItemListModel { SearchStoreId = "admin-submitted-store" };
+ await _controller.List(new DataSourceRequest { Page = 1, PageSize = 10 }, model);
+
+ Assert.AreEqual("admin-submitted-store", model.SearchStoreId);
+ }
+
+ [TestMethod]
+ public async Task ListGet_GlobalScope_PopulatesAvailableStores()
+ {
+ _scopeMock.Setup(s => s.DefaultStoreId).Returns((string)null);
+ var storeServiceMock = new Mock<IStoreService>();
+ storeServiceMock.Setup(s => s.GetAllStores()).ReturnsAsync(
+ new List<Grand.Domain.Stores.Store> { new() { Id = "s1", Shortcut = "Store One" } });
+ var controller = new TestNewsController(
+ _newsViewModelServiceMock.Object, _newsServiceMock.Object, new Mock<ILanguageService>().Object,
+ _translationServiceMock.Object, storeServiceMock.Object, new Mock<IDateTimeService>().Object,
+ _scopeMock.Object);
+ controller.ControllerContext = _controller.ControllerContext;
+ controller.TempData = _controller.TempData;
+
+ var result = await controller.List();
+
+ var view = result as ViewResult;
+ Assert.IsNotNull(view);
+ var model = (NewsItemListModel)view.Model;
+ Assert.IsTrue(model.AvailableStores.Any(s => s.Value == "s1"));
+ }
+
+ [TestMethod]
+ public async Task ListGet_StoreScoped_LeavesAvailableStoresEmpty()
+ {
+ _scopeMock.Setup(s => s.DefaultStoreId).Returns("store-1");
+ var storeServiceMock = new Mock<IStoreService>();
+ var controller = new TestNewsController(
+ _newsViewModelServiceMock.Object, _newsServiceMock.Object, new Mock<ILanguageService>().Object,
+ _translationServiceMock.Object, storeServiceMock.Object, new Mock<IDateTimeService>().Object,
+ _scopeMock.Object);
+ controller.ControllerContext = _controller.ControllerContext;
+ controller.TempData = _controller.TempData;
+
+ var result = await controller.List();
+
+ var view = result as ViewResult;
+ Assert.IsNotNull(view);
+ var model = (NewsItemListModel)view.Model;
+ Assert.AreEqual(0, model.AvailableStores.Count);
+ storeServiceMock.Verify(s => s.GetAllStores(), Times.Never);
+ }
+
+ [TestMethod]
+ public async Task CreatePost_InsertsOnce_NeverCallsUpdateNews()
+ {
+ var inserted = new NewsItem { Id = "new-1" };
+ _newsViewModelServiceMock
+ .Setup(v => v.InsertNewsItemModel(It.IsAny<NewsItemModel>()))
+ .ReturnsAsync(inserted);
+
+ await _controller.Create(new NewsItemModel { Title = "N" }, false);
+
+ _newsViewModelServiceMock.Verify(v => v.InsertNewsItemModel(It.IsAny<NewsItemModel>()), Times.Once);
+ _newsServiceMock.Verify(s => s.UpdateNews(It.IsAny<NewsItem>()), Times.Never);
+ }
+
+ [TestMethod]
+ public async Task CreatePost_StoreScoped_ForcesModelStores()
+ {
+ _scopeMock.Setup(s => s.DefaultStoreId).Returns("store-1");
+ var inserted = new NewsItem { Id = "new-1" };
+ _newsViewModelServiceMock
+ .Setup(v => v.InsertNewsItemModel(It.IsAny<NewsItemModel>()))
+ .ReturnsAsync(inserted)
+ .Callback<NewsItemModel>(m => Assert.AreEqual("store-1", m.Stores.Single()));
+
+ await _controller.Create(new NewsItemModel { Title = "N" }, false);
+
+ _newsViewModelServiceMock.Verify(v => v.InsertNewsItemModel(It.IsAny<NewsItemModel>()), Times.Once);
+ }
+
+ [TestMethod]
+ public async Task CreatePost_GlobalScoped_LeavesModelStoresUntouched()
+ {
+ _scopeMock.Setup(s => s.DefaultStoreId).Returns((string)null);
+ var inserted = new NewsItem { Id = "new-1" };
+ var submitted = new NewsItemModel { Title = "N", Stores = ["explicit-store"] };
+ _newsViewModelServiceMock
+ .Setup(v => v.InsertNewsItemModel(It.IsAny<NewsItemModel>()))
+ .ReturnsAsync(inserted)
+ .Callback<NewsItemModel>(m => Assert.AreEqual("explicit-store", m.Stores.Single()));
+
+ await _controller.Create(submitted, false);
+ }
+
+ [TestMethod]
+ public async Task CreateGet_PopulatesAllLanguages()
+ {
+ var languageServiceMock = new Mock<ILanguageService>();
+ languageServiceMock.Setup(l => l.GetAllLanguages(true, It.IsAny<string>()))
+ .ReturnsAsync(new List<Grand.Domain.Localization.Language> { new() { Id = "l1" } });
+ var controller = new TestNewsController(
+ _newsViewModelServiceMock.Object, _newsServiceMock.Object, languageServiceMock.Object,
+ _translationServiceMock.Object, new Mock<IStoreService>().Object, new Mock<IDateTimeService>().Object,
+ _scopeMock.Object);
+ controller.ControllerContext = _controller.ControllerContext;
+ controller.TempData = _controller.TempData;
+
+ await controller.Create();
+
+ // Confirms the value assigned to ViewBag.AllLanguages is the resolved list, not an unawaited
+ // Task object (the pre-existing bug this task fixes) - would throw InvalidCastException or
+ // fail this assertion if the bug were reintroduced.
+ var allLanguages = (IList<Grand.Domain.Localization.Language>)controller.ViewBag.AllLanguages;
+ Assert.AreEqual(1, allLanguages.Count);
+ }
+
+ [TestMethod]
+ public async Task EditGet_NewsItemNotFound_RedirectsToList()
+ {
+ _newsServiceMock.Setup(n => n.GetNewsById("missing")).ReturnsAsync((NewsItem)null);
+
+ var result = await _controller.Edit("missing");
+
+ var redirect = result as RedirectToActionResult;
+ Assert.IsNotNull(redirect);
+ Assert.AreEqual("List", redirect.ActionName);
+ _scopeMock.Verify(s => s.CanView(It.IsAny<NewsItem>()), Times.Never);
+ }
+
+ [TestMethod]
+ public async Task EditGet_ScopeDeniesView_RedirectsToList()
+ {
+ var newsItem = new NewsItem { Id = "n1" };
+ _newsServiceMock.Setup(n => n.GetNewsById("n1")).ReturnsAsync(newsItem);
+ _scopeMock.Setup(s => s.CanView(newsItem)).ReturnsAsync(false);
+
+ var result = await _controller.Edit("n1");
+
+ var redirect = result as RedirectToActionResult;
+ Assert.IsNotNull(redirect);
+ Assert.AreEqual("List", redirect.ActionName);
+ }
+
+ [TestMethod]
+ public async Task EditPost_ScopeDeniesAccess_RedirectsToEdit()
+ {
+ var newsItem = new NewsItem { Id = "n1" };
+ _newsServiceMock.Setup(n => n.GetNewsById("n1")).ReturnsAsync(newsItem);
+ _scopeMock.Setup(s => s.HasAccess(newsItem)).ReturnsAsync(false);
+
+ var result = await _controller.Edit(new NewsItemModel { Id = "n1" }, false);
+
+ var redirect = result as RedirectToActionResult;
+ Assert.IsNotNull(redirect);
+ Assert.AreEqual("Edit", redirect.ActionName);
+ _newsViewModelServiceMock.Verify(v => v.UpdateNewsItemModel(It.IsAny<NewsItem>(), It.IsAny<NewsItemModel>()), Times.Never);
+ }
+
+ [TestMethod]
+ public async Task Delete_ScopeDeniesAccess_RedirectsToListWithoutDeleting()
+ {
+ var newsItem = new NewsItem { Id = "n1" };
+ _newsServiceMock.Setup(n => n.GetNewsById("n1")).ReturnsAsync(newsItem);
+ _scopeMock.Setup(s => s.HasAccess(newsItem)).ReturnsAsync(false);
+
+ var result = await _controller.Delete("n1");
+
+ var redirect = result as RedirectToActionResult;
+ Assert.IsNotNull(redirect);
+ Assert.AreEqual("List", redirect.ActionName);
+ _newsServiceMock.Verify(n => n.DeleteNews(It.IsAny<NewsItem>()), Times.Never);
+ }
+
+ [TestMethod]
+ public async Task Delete_ScopeGrantsAccess_Deletes()
+ {
+ var newsItem = new NewsItem { Id = "n1" };
+ _newsServiceMock.Setup(n => n.GetNewsById("n1")).ReturnsAsync(newsItem);
+ _scopeMock.Setup(s => s.HasAccess(newsItem)).ReturnsAsync(true);
+
+ var result = await _controller.Delete("n1");
+
+ var redirect = result as RedirectToActionResult;
+ Assert.IsNotNull(redirect);
+ Assert.AreEqual("List", redirect.ActionName);
+ _newsServiceMock.Verify(n => n.DeleteNews(newsItem), Times.Once);
+ }
+
+ [TestMethod]
+ public void Comments_RedirectsToList()
+ {
+ // Comments(string) has no Comments.cshtml to render (unlike Blog, which has one) and is
+ // unreachable from the UI - the Comments tab's grid calls the POST overload only. Redirects
+ // instead of rendering a nonexistent view; see BaseNewsController's ruled fix comment.
+ var result = _controller.Comments("n1");
+
+ var redirect = result as RedirectToActionResult;
+ Assert.IsNotNull(redirect);
+ Assert.AreEqual("List", redirect.ActionName);
+ }
+
+ [TestMethod]
+ public async Task Comments_ScopeDeniesView_ReturnsKendoErrorWithoutCallingPrepareNewsCommentModel()
+ {
+ var newsItem = new NewsItem { Id = "n1" };
+ _newsServiceMock.Setup(n => n.GetNewsById("n1")).ReturnsAsync(newsItem);
+ _scopeMock.Setup(s => s.CanView(newsItem)).ReturnsAsync(false);
+
+ var result = await _controller.Comments("n1", new DataSourceRequest { Page = 1, PageSize = 10 });
+
+ var json = result as JsonResult;
+ Assert.IsNotNull(json);
+ var gridModel = (DataSourceResult)json.Value;
+ Assert.IsNotNull(gridModel.Errors);
+ _newsViewModelServiceMock.Verify(
+ v => v.PrepareNewsCommentModel(It.IsAny<string>(), It.IsAny<int>(), It.IsAny<int>()), Times.Never);
+ }
+
+ [TestMethod]
+ public async Task Comments_NewsItemNotFound_ReturnsKendoErrorWithoutCallingPrepareNewsCommentModel()
+ {
+ _newsServiceMock.Setup(n => n.GetNewsById("missing")).ReturnsAsync((NewsItem)null);
+
+ var result = await _controller.Comments("missing", new DataSourceRequest { Page = 1, PageSize = 10 });
+
+ var json = result as JsonResult;
+ Assert.IsNotNull(json);
+ var gridModel = (DataSourceResult)json.Value;
+ Assert.IsNotNull(gridModel.Errors);
+ _newsViewModelServiceMock.Verify(
+ v => v.PrepareNewsCommentModel(It.IsAny<string>(), It.IsAny<int>(), It.IsAny<int>()), Times.Never);
+ }
+
+ [TestMethod]
+ public async Task Comments_ScopeGrantsView_ReturnsCommentsGrid()
+ {
+ var newsItem = new NewsItem { Id = "n1" };
+ _newsServiceMock.Setup(n => n.GetNewsById("n1")).ReturnsAsync(newsItem);
+ _scopeMock.Setup(s => s.CanView(newsItem)).ReturnsAsync(true);
+ var commentModels = new List<NewsCommentModel> { new() { Id = "c1" } };
+ _newsViewModelServiceMock
+ .Setup(v => v.PrepareNewsCommentModel("n1", 1, 10))
+ .ReturnsAsync((commentModels, 1));
+
+ var result = await _controller.Comments("n1", new DataSourceRequest { Page = 1, PageSize = 10 });
+
+ var json = result as JsonResult;
+ Assert.IsNotNull(json);
+ var gridModel = (DataSourceResult)json.Value;
+ Assert.IsNull(gridModel.Errors);
+ Assert.AreEqual(1, gridModel.Total);
+ _newsViewModelServiceMock.Verify(v => v.PrepareNewsCommentModel("n1", 1, 10), Times.Once);
+ }
+
+ [TestMethod]
+ public async Task CommentDelete_ScopeDeniesAccess_ReturnsKendoErrorWithoutDeleting()
+ {
+ var comment = new NewsComment { Id = "c1", NewsItemId = "n1" };
+ var newsItem = new NewsItem { Id = "n1" };
+ _newsServiceMock.Setup(n => n.GetNewsById("n1")).ReturnsAsync(newsItem);
+ _scopeMock.Setup(s => s.HasAccess(newsItem)).ReturnsAsync(false);
+
+ var result = await _controller.CommentDelete(comment);
+
+ var json = result as JsonResult;
+ Assert.IsNotNull(json);
+ var gridModel = (DataSourceResult)json.Value;
+ Assert.IsNotNull(gridModel.Errors);
+ _newsViewModelServiceMock.Verify(v => v.CommentDelete(It.IsAny<NewsComment>()), Times.Never);
+ }
+
+ [TestMethod]
+ public async Task CommentDelete_ScopeGrantsAccess_Deletes()
+ {
+ var comment = new NewsComment { Id = "c1", NewsItemId = "n1" };
+ var newsItem = new NewsItem { Id = "n1" };
+ _newsServiceMock.Setup(n => n.GetNewsById("n1")).ReturnsAsync(newsItem);
+ _scopeMock.Setup(s => s.HasAccess(newsItem)).ReturnsAsync(true);
+
+ var result = await _controller.CommentDelete(comment);
+
+ var json = result as JsonResult;
+ Assert.IsNotNull(json);
+ _newsViewModelServiceMock.Verify(v => v.CommentDelete(comment), Times.Once);
+ }
+
+ [TestMethod]
+ public async Task CommentDelete_NewsItemNotFound_ReturnsKendoErrorWithoutDeleting()
+ {
+ var comment = new NewsComment { Id = "c1", NewsItemId = "missing" };
+ _newsServiceMock.Setup(n => n.GetNewsById("missing")).ReturnsAsync((NewsItem)null);
+
+ var result = await _controller.CommentDelete(comment);
+
+ var json = result as JsonResult;
+ Assert.IsNotNull(json);
+ var gridModel = (DataSourceResult)json.Value;
+ Assert.IsNotNull(gridModel.Errors);
+ _newsViewModelServiceMock.Verify(v => v.CommentDelete(It.IsAny<NewsComment>()), Times.Never);
+ }
+}
diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/NewsControllerTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/NewsControllerTests.cs
new file mode 100644
index 000000000..20e8de8b7
--- /dev/null
+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/NewsControllerTests.cs
@@ -0,0 +1,35 @@
+using Grand.Web.Admin.Controllers;
+using Grand.Web.AdminShared.Controllers;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System.Reflection;
+
+namespace Grand.Web.Admin.Tests.Controllers;
+
+[TestClass]
+public class NewsControllerTests
+{
+ [TestMethod]
+ public void NewsController_IsThinSubclassOfBaseNewsController()
+ {
+ Assert.IsTrue(typeof(BaseNewsController).IsAssignableFrom(typeof(NewsController)));
+ Assert.AreNotEqual(typeof(BaseNewsController), typeof(NewsController));
+ }
+
+ [TestMethod]
+ public void NewsController_HasRequiredHostAttributes()
+ {
+ var type = typeof(NewsController);
+
+ var areaAttr = type.GetCustomAttribute<AreaAttribute>(inherit: false);
+ Assert.IsNotNull(areaAttr);
+ Assert.AreEqual("Admin", areaAttr.RouteValue);
+
+ Assert.IsNotNull(type.GetCustomAttribute<Grand.Web.Common.Filters.AuthorizeMenuAttribute>(inherit: false));
+ Assert.IsNotNull(type.GetCustomAttribute<AutoValidateAntiforgeryTokenAttribute>(inherit: false));
+ // Confirm the actual namespace of AuthorizeAdminAttribute by reading the file that declares it
+ // before writing this assertion - Phase 15 found it lives in Grand.Web.Common.Filters, not
+ // Grand.Web.Admin.Extensions as might be assumed.
+ Assert.IsNotNull(type.GetCustomAttribute<Grand.Web.Common.Filters.AuthorizeAdminAttribute>(inherit: false));
+ }
+}
diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/RoutedNewsItemDataScopeTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/RoutedNewsItemDataScopeTests.cs
new file mode 100644
index 000000000..8e0789477
--- /dev/null
+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/RoutedNewsItemDataScopeTests.cs
@@ -0,0 +1,66 @@
+using Grand.Domain.News;
+using Grand.Web.AdminShared.Interfaces;
+using Grand.Web.AdminShared.Services;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+
+namespace Grand.Web.Admin.Tests.Controllers;
+
+[TestClass]
+public class RoutedNewsItemDataScopeTests
+{
+ private static RoutedNewsItemDataScope Build(string area, out Mock<IAdminDataScope<NewsItem>> globalMock, out Mock<IAdminDataScope<NewsItem>> storeMock)
+ {
+ var httpContext = new DefaultHttpContext();
+ if (area != null)
+ httpContext.Request.RouteValues = new RouteValueDictionary { ["area"] = area };
+
+ var httpContextAccessorMock = new Mock<IHttpContextAccessor>();
+ httpContextAccessorMock.Setup(a => a.HttpContext).Returns(httpContext);
+
+ var global = new GlobalAdminDataScope<NewsItem>();
+ var store = new StoreAdminDataScope<NewsItem>(BuildContextAccessor());
+ globalMock = null;
+ storeMock = null;
+ return new RoutedNewsItemDataScope(httpContextAccessorMock.Object, global, store);
+ }
+
+ private static Grand.Infrastructure.IContextAccessor BuildContextAccessor()
+ {
+ var workContext = new Mock<Grand.Infrastructure.IWorkContext>();
+ workContext.Setup(w => w.CurrentCustomer).Returns(new Grand.Domain.Customers.Customer { StaffStoreId = "store-1" });
+ var contextAccessorMock = new Mock<Grand.Infrastructure.IContextAccessor>();
+ contextAccessorMock.Setup(c => c.WorkContext).Returns(workContext.Object);
+ return contextAccessorMock.Object;
+ }
+
+ [TestMethod]
+ public void DefaultStoreId_AdminArea_ResolvesToGlobalScope()
+ {
+ var routed = Build("Admin", out _, out _);
+ Assert.IsNull(routed.DefaultStoreId);
+ }
+
+ [TestMethod]
+ public void DefaultStoreId_StoreArea_ResolvesToStoreScope()
+ {
+ var routed = Build("Store", out _, out _);
+ Assert.AreEqual("store-1", routed.DefaultStoreId);
+ }
+
+ [TestMethod]
+ public void DefaultStoreId_VendorArea_ThrowsFailClosed()
+ {
+ var routed = Build("Vendor", out _, out _);
+ Assert.ThrowsExactly<InvalidOperationException>(() => _ = routed.DefaultStoreId);
+ }
+
+ [TestMethod]
+ public void DefaultStoreId_MissingArea_ThrowsFailClosed()
+ {
+ var routed = Build(null, out _, out _);
+ Assert.ThrowsExactly<InvalidOperationException>(() => _ = routed.DefaultStoreId);
+ }
+}
diff --git a/src/Tests/Grand.Web.Store.Tests/Controllers/NewsControllerTests.cs b/src/Tests/Grand.Web.Store.Tests/Controllers/NewsControllerTests.cs
new file mode 100644
index 000000000..f3e230887
--- /dev/null
+++ b/src/Tests/Grand.Web.Store.Tests/Controllers/NewsControllerTests.cs
@@ -0,0 +1,168 @@
+using Grand.Business.Core.Interfaces.Cms;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Domain.News;
+using Grand.Infrastructure.Mapper;
+using Grand.Mapping;
+using Grand.Web.AdminShared.Interfaces;
+using Grand.Web.AdminShared.Mapper;
+using Grand.Web.Store.Controllers;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.Extensions.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using System.Reflection;
+
+namespace Grand.Web.Store.Tests.Controllers;
+
+[TestClass]
+public class NewsControllerTests
+{
+ private NewsController _controller;
+ private Mock<INewsService> _newsServiceMock;
+ private Mock<IAdminDataScope<NewsItem>> _scopeMock;
+
+ [TestInitialize]
+ public void Setup()
+ {
+ var mapperConfig = new MapperConfiguration(cfg => cfg.AddProfile<NewsItemProfile>());
+ AutoMapperConfig.Init(mapperConfig);
+
+ _newsServiceMock = new Mock<INewsService>();
+ _scopeMock = new Mock<IAdminDataScope<NewsItem>>();
+ _scopeMock.Setup(s => s.DefaultStoreId).Returns("store-1");
+
+ var languageServiceMock = new Mock<ILanguageService>();
+ languageServiceMock.Setup(l => l.GetAllLanguages(true, It.IsAny<string>()))
+ .ReturnsAsync(new List<Grand.Domain.Localization.Language>());
+
+ _controller = new NewsController(
+ new Mock<INewsViewModelService>().Object,
+ _newsServiceMock.Object,
+ languageServiceMock.Object,
+ new Mock<ITranslationService>().Object,
+ new Mock<IStoreService>().Object,
+ new Mock<IDateTimeService>().Object,
+ _scopeMock.Object);
+
+ var httpContext = new DefaultHttpContext();
+ var loggerFactoryMock = new Mock<ILoggerFactory>();
+ loggerFactoryMock.Setup(l => l.CreateLogger(It.IsAny<string>())).Returns(new Mock<ILogger>().Object);
+ var urlHelperFactoryMock = new Mock<IUrlHelperFactory>();
+ urlHelperFactoryMock.Setup(f => f.GetUrlHelper(It.IsAny<ActionContext>())).Returns(new Mock<IUrlHelper>().Object);
+ var requestServicesMock = new Mock<IServiceProvider>();
+ requestServicesMock.Setup(s => s.GetService(typeof(ILoggerFactory))).Returns(loggerFactoryMock.Object);
+ requestServicesMock.Setup(s => s.GetService(typeof(IUrlHelperFactory))).Returns(urlHelperFactoryMock.Object);
+ httpContext.RequestServices = requestServicesMock.Object;
+ _controller.ControllerContext = new ControllerContext { HttpContext = httpContext };
+ _controller.TempData = new TempDataDictionary(httpContext, new Mock<ITempDataProvider>().Object);
+ }
+
+ [TestMethod]
+ public void NewsController_HasRequiredHostAttributes()
+ {
+ var type = typeof(NewsController);
+
+ var areaAttr = type.GetCustomAttribute<AreaAttribute>(inherit: false);
+ Assert.IsNotNull(areaAttr);
+ Assert.AreEqual("Store", areaAttr.RouteValue);
+
+ Assert.IsNotNull(type.GetCustomAttribute<Grand.Web.Common.Filters.AuthorizeStoreAttribute>(inherit: false));
+ Assert.IsNotNull(type.GetCustomAttribute<Grand.Web.Common.Filters.AuthorizeMenuAttribute>(inherit: false));
+ Assert.IsNotNull(type.GetCustomAttribute<AutoValidateAntiforgeryTokenAttribute>(inherit: false));
+ }
+
+ // --- EditWarningCheck truth table -----------------------------------------------------------
+
+ [TestMethod]
+ public async Task EditGet_NotLimitedToStores_WarningFires()
+ {
+ var newsItem = new NewsItem { Id = "n1", LimitedToStores = false };
+ _newsServiceMock.Setup(n => n.GetNewsById("n1")).ReturnsAsync(newsItem);
+ _scopeMock.Setup(s => s.CanView(newsItem)).ReturnsAsync(true);
+
+ await _controller.Edit("n1");
+
+ Assert.IsTrue(_controller.TempData.ContainsKey("grand.notifications.Warning"));
+ }
+
+ [TestMethod]
+ public async Task EditGet_LimitedContainsStore_CountGreaterThanOne_WarningFires()
+ {
+ var newsItem = new NewsItem { Id = "n1", LimitedToStores = true, Stores = ["store-1", "store-2"] };
+ _newsServiceMock.Setup(n => n.GetNewsById("n1")).ReturnsAsync(newsItem);
+ _scopeMock.Setup(s => s.CanView(newsItem)).ReturnsAsync(true);
+
+ await _controller.Edit("n1");
+
+ Assert.IsTrue(_controller.TempData.ContainsKey("grand.notifications.Warning"));
+ }
+
+ [TestMethod]
+ public async Task EditGet_LimitedContainsStore_CountOne_NoWarning()
+ {
+ var newsItem = new NewsItem { Id = "n1", LimitedToStores = true, Stores = ["store-1"] };
+ _newsServiceMock.Setup(n => n.GetNewsById("n1")).ReturnsAsync(newsItem);
+ _scopeMock.Setup(s => s.CanView(newsItem)).ReturnsAsync(true);
+
+ await _controller.Edit("n1");
+
+ Assert.IsFalse(_controller.TempData.ContainsKey("grand.notifications.Warning"));
+ }
+
+ [TestMethod]
+ public async Task EditGet_LimitedDoesNotContainStore_NoWarning()
+ {
+ var newsItem = new NewsItem { Id = "n1", LimitedToStores = true, Stores = ["other-store"] };
+ _newsServiceMock.Setup(n => n.GetNewsById("n1")).ReturnsAsync(newsItem);
+ _scopeMock.Setup(s => s.CanView(newsItem)).ReturnsAsync(true);
+
+ await _controller.Edit("n1");
+
+ Assert.IsFalse(_controller.TempData.ContainsKey("grand.notifications.Warning"));
+ }
+
+ // --- Preview -------------------------------------------------------------------------------------
+
+ [TestMethod]
+ public async Task Preview_NewsItemNotFound_RedirectsToList()
+ {
+ _newsServiceMock.Setup(n => n.GetNewsById("missing")).ReturnsAsync((NewsItem)null);
+
+ var result = await _controller.Preview("missing");
+
+ var redirect = result as RedirectToActionResult;
+ Assert.IsNotNull(redirect);
+ Assert.AreEqual("List", redirect.ActionName);
+ }
+
+ [TestMethod]
+ public async Task Preview_ScopeDeniesAccess_RedirectsToList()
+ {
+ var newsItem = new NewsItem { Id = "n1" };
+ _newsServiceMock.Setup(n => n.GetNewsById("n1")).ReturnsAsync(newsItem);
+ _scopeMock.Setup(s => s.HasAccess(newsItem)).ReturnsAsync(false);
+
+ var result = await _controller.Preview("n1");
+
+ var redirect = result as RedirectToActionResult;
+ Assert.IsNotNull(redirect);
+ Assert.AreEqual("List", redirect.ActionName);
+ }
+
+ [TestMethod]
+ public async Task Preview_ScopeGrantsAccess_ReturnsViewWithModel()
+ {
+ var newsItem = new NewsItem { Id = "n1", Title = "Hello" };
+ _newsServiceMock.Setup(n => n.GetNewsById("n1")).ReturnsAsync(newsItem);
+ _scopeMock.Setup(s => s.HasAccess(newsItem)).ReturnsAsync(true);
+
+ var result = await _controller.Preview("n1");
+
+ Assert.IsInstanceOfType(result, typeof(ViewResult));
+ }
+}
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Partials/CreateOrUpdate.TabComments.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Partials/CreateOrUpdate.TabComments.cshtml
deleted file mode 100644
index 9066a7a6f..000000000
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Partials/CreateOrUpdate.TabComments.cshtml
+++ /dev/null
@@ -1,96 +0,0 @@
-@model NewsItemModel
-@inject AdminAreaSettings adminAreaSettings
-<vc:admin-widget widget-zone="news_details_comments_list" additional-data="Model"/>
-@if (!string.IsNullOrEmpty(Model.Id))
-{
- <div class="panel panel-default">
- <vc:admin-widget widget-zone="news_details_comments_top" additional-data="Model"/>
- <div class="panel-body">
- <div id="comments-grid"></div>
- </div>
- <vc:admin-widget widget-zone="news_details_comments_bottom" additional-data="Model"/>
- </div>
- <script>
- $(document).ready(function () {
- $("#comments-grid").kendoGrid({
- dataSource: {
- transport: {
- read: {
- url: "@Url.Action("Comments", "News", new { filterByNewsItemId = Model.Id, area = Constants.AreaAdmin })",
- type: "POST",
- dataType: "json",
- data: addAntiForgeryToken
- },
- destroy: {
- url: "@Html.Raw(Url.Action("CommentDelete", "News", new { area = Constants.AreaAdmin }))",
- type: "POST",
- dataType: "json",
- data: addAntiForgeryToken
- }
- },
- schema: {
- data: "Data",
- total: "Total",
- errors: "Errors",
- model: {
- id: "Id",
- fields: {
- //do not implicitly specify all fields
- //we do it only for fields which implicitly require it
- //otherwise, they'll be formatted wrong way
- CreatedOn: {type: "date" }
- }
- }
- },
- error: function(e) {
- display_kendoui_grid_error(e);
- // Cancel the changes
- this.cancelChanges();
- },
- pageSize: @(adminAreaSettings.DefaultGridPageSize),
- serverPaging: true,
- serverFiltering: true,
- serverSorting: true
- },
- pageable: {
- refresh: true,
- pageSizes: [@(adminAreaSettings.GridPageSizes)]
- },
- editable: {
- confirmation: true,
- mode: "inline"
- },
- scrollable: false,
- columns: [{
- field: "CustomerId",
- title: "@Loc["Admin.Content.News.Comments.Fields.Customer"]",
- width: 200,
- template: '<a class="k-link" href="@Url.Action("Edit", "Customer", new { area = Constants.AreaAdmin })/#=CustomerId#">#:kendo.htmlEncode(CustomerInfo)#</a>'
- }, {
- field: "CommentTitle",
- title: "@Loc["Admin.Content.News.Comments.Fields.CommentTitle"]"
- }, {
- field: "CommentText",
- title: "@Loc["Admin.Content.News.Comments.Fields.CommentText"]",
- encoded: false
- }, {
- field: "CreatedOn",
- title: "@Loc["Admin.Content.News.Comments.Fields.CreatedOn"]",
- width: 200,
- type: "date",
- format: "{0:G}"
- }, {
- command: { name: "destroy", text: "@Loc["Admin.Common.Delete"]" },
- title: "@Loc["Admin.Common.Delete"]",
- width: 100
- }]
- });
- });
- </script>
-}
-else
-{
- <div class="note note-info">
- @Loc["Admin.Content.News.NewsItems.SaveBeforeEdit"]
- </div>
-}
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Partials/CreateOrUpdate.TabSeo.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Partials/CreateOrUpdate.TabSeo.cshtml
deleted file mode 100644
index 2f504cbfe..000000000
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Partials/CreateOrUpdate.TabSeo.cshtml
+++ /dev/null
@@ -1,75 +0,0 @@
-@using Microsoft.AspNetCore.Mvc.Razor
-@model NewsItemModel
-
-<vc:admin-widget widget-zone="news_details_seo_top" additional-data="Model"/>
-@{
- Func<int, HelperResult>
- template = @<div class="form-body">
- <div class="form-group">
- <admin-label asp-for="@Model.Locales[item].MetaKeywords"/>
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="@Model.Locales[item].MetaKeywords"/>
- <span asp-validation-for="@Model.Locales[item].MetaKeywords"></span>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="@Model.Locales[item].MetaDescription"/>
- <div class="col-md-9 col-sm-9">
- <admin-textarea asp-for="@Model.Locales[item].MetaDescription"></admin-textarea>
- <span asp-validation-for="@Model.Locales[item].MetaDescription"></span>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="@Model.Locales[item].MetaTitle"/>
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="@Model.Locales[item].MetaTitle"/>
- <span asp-validation-for="@Model.Locales[item].MetaTitle"></span>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="@Model.Locales[item].SeName"/>
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="@Model.Locales[item].SeName"/>
- <span asp-validation-for="@Model.Locales[item].SeName"></span>
- </div>
- </div>
- <input asp-for="@Model.Locales[item].LanguageId" type="hidden"/>
- </div>;
-}
-
-<div class="form-horizontal">
- <localized-editor localized-template="@template" name="newsitem-seo-localized" language-ids="@Model.Locales.Select(c => c.LanguageId).ToList()">
- <div class="form-body">
- <div class="form-group">
- <admin-label asp-for="MetaKeywords"/>
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="MetaKeywords"/>
- <span asp-validation-for="MetaKeywords"></span>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="MetaDescription"/>
- <div class="col-md-9 col-sm-9">
- <admin-textarea asp-for="MetaDescription"></admin-textarea>
- <span asp-validation-for="MetaDescription"></span>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="MetaTitle"/>
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="MetaTitle"/>
- <span asp-validation-for="MetaTitle"></span>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="SeName"/>
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="SeName"/>
- <span asp-validation-for="SeName"></span>
- </div>
- </div>
- </div>
- </localized-editor>
-
-</div>
-<vc:admin-widget widget-zone="news_details_seo_bottom" additional-data="Model"/>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Partials/WidgetZone.DetailsButtons.Create.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Partials/WidgetZone.DetailsButtons.Create.cshtml
new file mode 100644
index 000000000..f2c945411
--- /dev/null
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Partials/WidgetZone.DetailsButtons.Create.cshtml
@@ -0,0 +1 @@
+<vc:admin-widget widget-zone="news_details_buttons" additional-data="null"/>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Partials/WidgetZone.DetailsButtons.Edit.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Partials/WidgetZone.DetailsButtons.Edit.cshtml
new file mode 100644
index 000000000..30b8c212b
--- /dev/null
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Partials/WidgetZone.DetailsButtons.Edit.cshtml
@@ -0,0 +1,3 @@
+@using Grand.Web.AdminShared.Models.News
+@model NewsItemModel
+<vc:admin-widget widget-zone="news_details_buttons" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Partials/WidgetZone.DetailsCommentsBottom.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Partials/WidgetZone.DetailsCommentsBottom.cshtml
new file mode 100644
index 000000000..7c73e3b30
--- /dev/null
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Partials/WidgetZone.DetailsCommentsBottom.cshtml
@@ -0,0 +1,3 @@
+@using Grand.Web.AdminShared.Models.News
+@model NewsItemModel
+<vc:admin-widget widget-zone="news_details_comments_bottom" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Partials/WidgetZone.DetailsCommentsList.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Partials/WidgetZone.DetailsCommentsList.cshtml
new file mode 100644
index 000000000..298c7eebd
--- /dev/null
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Partials/WidgetZone.DetailsCommentsList.cshtml
@@ -0,0 +1,3 @@
+@using Grand.Web.AdminShared.Models.News
+@model NewsItemModel
+<vc:admin-widget widget-zone="news_details_comments_list" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Partials/WidgetZone.DetailsCommentsTop.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Partials/WidgetZone.DetailsCommentsTop.cshtml
new file mode 100644
index 000000000..de6d83eb1
--- /dev/null
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Partials/WidgetZone.DetailsCommentsTop.cshtml
@@ -0,0 +1,3 @@
+@using Grand.Web.AdminShared.Models.News
+@model NewsItemModel
+<vc:admin-widget widget-zone="news_details_comments_top" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Partials/WidgetZone.DetailsInfoBottom.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Partials/WidgetZone.DetailsInfoBottom.cshtml
new file mode 100644
index 000000000..527b143a4
--- /dev/null
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Partials/WidgetZone.DetailsInfoBottom.cshtml
@@ -0,0 +1,3 @@
+@using Grand.Web.AdminShared.Models.News
+@model NewsItemModel
+<vc:admin-widget widget-zone="news_details_info_bottom" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Partials/WidgetZone.DetailsInfoTop.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Partials/WidgetZone.DetailsInfoTop.cshtml
new file mode 100644
index 000000000..45c7bec50
--- /dev/null
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Partials/WidgetZone.DetailsInfoTop.cshtml
@@ -0,0 +1,3 @@
+@using Grand.Web.AdminShared.Models.News
+@model NewsItemModel
+<vc:admin-widget widget-zone="news_details_info_top" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Partials/WidgetZone.DetailsSeoBottom.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Partials/WidgetZone.DetailsSeoBottom.cshtml
new file mode 100644
index 000000000..4dc77016a
--- /dev/null
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Partials/WidgetZone.DetailsSeoBottom.cshtml
@@ -0,0 +1,3 @@
+@using Grand.Web.AdminShared.Models.News
+@model NewsItemModel
+<vc:admin-widget widget-zone="news_details_seo_bottom" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Partials/WidgetZone.DetailsSeoTop.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Partials/WidgetZone.DetailsSeoTop.cshtml
new file mode 100644
index 000000000..87f8b379a
--- /dev/null
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Partials/WidgetZone.DetailsSeoTop.cshtml
@@ -0,0 +1,3 @@
+@using Grand.Web.AdminShared.Models.News
+@model NewsItemModel
+<vc:admin-widget widget-zone="news_details_seo_top" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Partials/WidgetZone.DetailsTabs.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Partials/WidgetZone.DetailsTabs.cshtml
new file mode 100644
index 000000000..ff3ba03b4
--- /dev/null
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Partials/WidgetZone.DetailsTabs.cshtml
@@ -0,0 +1,3 @@
+@using Grand.Web.AdminShared.Models.News
+@model NewsItemModel
+<vc:admin-widget widget-zone="news_details_tabs" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Partials/WidgetZone.ListButtons.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Partials/WidgetZone.ListButtons.cshtml
new file mode 100644
index 000000000..db14baf13
--- /dev/null
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Partials/WidgetZone.ListButtons.cshtml
@@ -0,0 +1 @@
+<vc:admin-widget widget-zone="news_list_buttons" additional-data="null"/>
diff --git a/src/Web/Grand.Web.Admin/Controllers/NewsController.cs b/src/Web/Grand.Web.Admin/Controllers/NewsController.cs
index e84b124b7..82f8b9a8c 100644
--- a/src/Web/Grand.Web.Admin/Controllers/NewsController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/NewsController.cs
@@ -1,229 +1,32 @@
-using Grand.Business.Core.Extensions;
using Grand.Business.Core.Interfaces.Cms;
using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Business.Core.Interfaces.Common.Stores;
-using Grand.Domain.Permissions;
using Grand.Domain.News;
-using Grand.Web.AdminShared.Extensions.Mapping;
+using Grand.Web.Admin.Extensions;
+using Grand.Web.AdminShared.Controllers;
using Grand.Web.AdminShared.Interfaces;
-using Grand.Web.AdminShared.Models.News;
-using Grand.Web.Common.DataSource;
using Grand.Web.Common.Filters;
-using Grand.Web.Common.Security.Authorization;
+using Grand.Web.Common.Localization;
using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Rendering;
namespace Grand.Web.Admin.Controllers;
-[PermissionAuthorize(PermissionSystemName.News)]
-public class NewsController : BaseAdminController
-{
- #region Constructors
-
- public NewsController(
- INewsViewModelService newsViewModelService,
- INewsService newsService,
- ILanguageService languageService,
- ITranslationService translationService,
- IStoreService storeService,
- IDateTimeService dateTimeService)
- {
- _newsViewModelService = newsViewModelService;
- _newsService = newsService;
- _languageService = languageService;
- _translationService = translationService;
- _storeService = storeService;
- _dateTimeService = dateTimeService;
- }
-
- #endregion
-
- #region Fields
-
- private readonly INewsViewModelService _newsViewModelService;
- private readonly INewsService _newsService;
- private readonly ILanguageService _languageService;
- private readonly ITranslationService _translationService;
- private readonly IStoreService _storeService;
- private readonly IDateTimeService _dateTimeService;
-
- #endregion
-
- #region News items
-
- public IActionResult Index()
- {
- return RedirectToAction("List");
- }
-
- public async Task<IActionResult> List()
- {
- var model = new NewsItemListModel();
- //stores
- 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 });
-
- return View(model);
- }
-
- [PermissionAuthorizeAction(PermissionActionName.List)]
- [HttpPost]
- public async Task<IActionResult> List(DataSourceRequest command, NewsItemListModel model)
- {
- var news = await _newsViewModelService.PrepareNewsItemModel(model, command.Page, command.PageSize);
- var gridModel = new DataSourceResult {
- Data = news.newsItemModels.ToList(),
- Total = news.totalCount
- };
- return Json(gridModel);
- }
-
- [PermissionAuthorizeAction(PermissionActionName.Create)]
- public async Task<IActionResult> Create()
- {
- ViewBag.AllLanguages = _languageService.GetAllLanguages(true);
- var model = new NewsItemModel {
- //default values
- Published = true,
- AllowComments = true
- };
-
- //locales
- await AddLocales(_languageService, model.Locales);
- return View(model);
- }
-
- [PermissionAuthorizeAction(PermissionActionName.Edit)]
- [HttpPost]
- [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]
- public async Task<IActionResult> Create(NewsItemModel model, bool continueEditing)
- {
- if (ModelState.IsValid)
- {
- var newsItem = await _newsViewModelService.InsertNewsItemModel(model);
- Success(_translationService.GetResource("Admin.Content.News.NewsItems.Added"));
- return continueEditing ? RedirectToAction("Edit", new { id = newsItem.Id }) : RedirectToAction("List");
- }
-
- //If we got this far, something failed, redisplay form
- ViewBag.AllLanguages = _languageService.GetAllLanguages(true);
- return View(model);
- }
-
- [PermissionAuthorizeAction(PermissionActionName.Preview)]
- public async Task<IActionResult> Edit(string id)
- {
- var newsItem = await _newsService.GetNewsById(id);
- if (newsItem == null)
- //No news item found with the specified id
- return RedirectToAction("List");
-
- ViewBag.AllLanguages = await _languageService.GetAllLanguages(true);
- var model = newsItem.ToModel(_dateTimeService);
- //locales
- await AddLocales(_languageService, model.Locales, (locale, languageId) =>
- {
- locale.Title = newsItem.GetTranslation(x => x.Title, languageId, false);
- locale.Short = newsItem.GetTranslation(x => x.Short, languageId, false);
- locale.Full = newsItem.GetTranslation(x => x.Full, languageId, false);
- locale.MetaKeywords = newsItem.GetTranslation(x => x.MetaKeywords, languageId, false);
- locale.MetaDescription = newsItem.GetTranslation(x => x.MetaDescription, languageId, false);
- locale.MetaTitle = newsItem.GetTranslation(x => x.MetaTitle, languageId, false);
- locale.SeName = newsItem.GetSeName(languageId, false);
- });
- return View(model);
- }
-
- [PermissionAuthorizeAction(PermissionActionName.Edit)]
- [HttpPost]
- [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]
- public async Task<IActionResult> Edit(NewsItemModel model, bool continueEditing)
- {
- var newsItem = await _newsService.GetNewsById(model.Id);
- if (newsItem == null)
- //No news item found with the specified id
- return RedirectToAction("List");
-
- if (ModelState.IsValid)
- {
- newsItem = await _newsViewModelService.UpdateNewsItemModel(newsItem, model);
- Success(_translationService.GetResource("Admin.Content.News.NewsItems.Updated"));
-
- if (continueEditing)
- {
- //selected tab
- await SaveSelectedTabIndex();
-
- return RedirectToAction("Edit", new { id = newsItem.Id });
- }
-
- return RedirectToAction("List");
- }
-
- //If we got this far, something failed, redisplay form
- ViewBag.AllLanguages = await _languageService.GetAllLanguages(true);
-
- return View(model);
- }
-
- [PermissionAuthorizeAction(PermissionActionName.Delete)]
- [HttpPost]
- public async Task<IActionResult> Delete(string id)
- {
- var newsItem = await _newsService.GetNewsById(id);
- if (newsItem == null)
- //No news item found with the specified id
- return RedirectToAction("List");
- if (ModelState.IsValid)
- {
- await _newsService.DeleteNews(newsItem);
-
- Success(_translationService.GetResource("Admin.Content.News.NewsItems.Deleted"));
- return RedirectToAction("List");
- }
-
- Error(ModelState);
- return RedirectToAction("Edit", new { id = newsItem.Id });
- }
-
- #endregion
-
- #region Comments
-
- public IActionResult Comments(string filterByNewsItemId)
- {
- ViewBag.FilterByNewsItemId = filterByNewsItemId;
- return View();
- }
-
- [PermissionAuthorizeAction(PermissionActionName.List)]
- [HttpPost]
- public async Task<IActionResult> Comments(string filterByNewsItemId, DataSourceRequest command)
- {
- var comments = await _newsViewModelService.PrepareNewsCommentModel(filterByNewsItemId, command.Page, command.PageSize);
-
- var gridModel = new DataSourceResult {
- Data = comments.newsCommentModels.ToList(),
- Total = comments.totalCount
- };
- return Json(gridModel);
- }
-
- [PermissionAuthorizeAction(PermissionActionName.Delete)]
- [HttpPost]
- public async Task<IActionResult> CommentDelete(NewsComment model)
- {
- if (ModelState.IsValid)
- {
- await _newsViewModelService.CommentDelete(model);
- return new JsonResult("");
- }
-
- return ErrorForKendoGridJson(ModelState);
- }
-
- #endregion
-}
\ No newline at end of file
+// Reduced to a thin subclass of BaseNewsController (ARCH-001 News consolidation). All shared
+// behavior lives in the base; this class only supplies Admin's DI wiring plus the attributes that
+// used to arrive transitively via BaseAdminController - BaseNewsController can't inherit any single
+// host's base controller. Same pattern as CategoryController (see that file).
+[AuthorizeAdmin]
+[AutoValidateAntiforgeryToken]
+[Area(Constants.AreaAdmin)]
+[AuthorizeMenu]
+public class NewsController(
+ INewsViewModelService newsViewModelService,
+ INewsService newsService,
+ ILanguageService languageService,
+ ITranslationService translationService,
+ IStoreService storeService,
+ IDateTimeService dateTimeService,
+ IAdminDataScope<NewsItem> scope)
+ : BaseNewsController(newsViewModelService, newsService, languageService, translationService,
+ storeService, dateTimeService, scope);
diff --git a/src/Web/Grand.Web.AdminShared/Controllers/BaseNewsController.cs b/src/Web/Grand.Web.AdminShared/Controllers/BaseNewsController.cs
new file mode 100644
index 000000000..edf63ebff
--- /dev/null
+++ b/src/Web/Grand.Web.AdminShared/Controllers/BaseNewsController.cs
@@ -0,0 +1,226 @@
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Cms;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Domain.News;
+using Grand.Domain.Permissions;
+using Grand.Web.AdminShared.Extensions.Mapping;
+using Grand.Web.AdminShared.Interfaces;
+using Grand.Web.AdminShared.Models.News;
+using Grand.Web.Common.Controllers;
+using Grand.Web.Common.DataSource;
+using Grand.Web.Common.Filters;
+using Grand.Web.Common.Security.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Rendering;
+
+namespace Grand.Web.AdminShared.Controllers;
+
+[PermissionAuthorize(PermissionSystemName.News)]
+[AutoValidateAntiforgeryToken]
+public abstract class BaseNewsController(
+ INewsViewModelService newsViewModelService,
+ INewsService newsService,
+ ILanguageService languageService,
+ ITranslationService translationService,
+ IStoreService storeService,
+ IDateTimeService dateTimeService,
+ IAdminDataScope<NewsItem> scope)
+ : BaseController
+{
+ /// <summary>Hook for host-specific UI-copy warnings on Edit(GET) that aren't access-scope
+ /// decisions. Overridden by the Store subclass (Task 4); no-op everywhere else. Fourth occurrence
+ /// of this exact pattern in ARCH-001 (Category, Blog, Page, now News) - treat as proven.</summary>
+ protected virtual void EditWarningCheck(NewsItem newsItem) { }
+
+ // Exposed for host subclasses: primary-constructor parameters are not visible to derived classes
+ // by name in C#.
+ protected ITranslationService TranslationService => translationService;
+ protected IAdminDataScope<NewsItem> Scope => scope;
+
+ #region News items
+
+ public IActionResult Index() => RedirectToAction("List");
+
+ public async Task<IActionResult> List()
+ {
+ var model = new NewsItemListModel();
+ if (scope.DefaultStoreId is null)
+ {
+ 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 });
+ }
+ return View(model);
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.List)]
+ [HttpPost]
+ public async Task<IActionResult> List(DataSourceRequest command, NewsItemListModel model)
+ {
+ if (scope.DefaultStoreId is not null) model.SearchStoreId = scope.DefaultStoreId;
+
+ var news = await newsViewModelService.PrepareNewsItemModel(model, command.Page, command.PageSize);
+ var gridModel = new DataSourceResult {
+ Data = news.newsItemModels.ToList(),
+ Total = news.totalCount
+ };
+ return Json(gridModel);
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Create)]
+ public async Task<IActionResult> Create()
+ {
+ ViewBag.AllLanguages = await languageService.GetAllLanguages(true);
+ var model = new NewsItemModel {
+ Published = true,
+ AllowComments = true
+ };
+ await AddLocales(languageService, model.Locales);
+ return View(model);
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ [HttpPost]
+ [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]
+ public async Task<IActionResult> Create(NewsItemModel model, bool continueEditing)
+ {
+ if (ModelState.IsValid)
+ {
+ if (scope.DefaultStoreId is not null) model.Stores = [scope.DefaultStoreId];
+ // Store's original called _newsService.UpdateNews(newsItem) again here, right after
+ // InsertNewsItemModel (which already inserts internally) - a redundant double-write with
+ // no purpose. Dropped as a ruled, disclosed fix.
+ var newsItem = await newsViewModelService.InsertNewsItemModel(model);
+ Success(translationService.GetResource("Admin.Content.News.NewsItems.Added"));
+ return continueEditing ? RedirectToAction("Edit", new { id = newsItem.Id }) : RedirectToAction("List");
+ }
+
+ // Ruled fix: Admin's original assigned the unawaited Task here instead of the resolved list.
+ ViewBag.AllLanguages = await languageService.GetAllLanguages(true);
+ return View(model);
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Preview)]
+ public async Task<IActionResult> Edit(string id)
+ {
+ var newsItem = await newsService.GetNewsById(id);
+ if (newsItem == null) return RedirectToAction("List");
+
+ EditWarningCheck(newsItem);
+ if (!await scope.CanView(newsItem)) return RedirectToAction("List");
+
+ ViewBag.AllLanguages = await languageService.GetAllLanguages(true);
+ var model = newsItem.ToModel(dateTimeService);
+ await AddLocales(languageService, model.Locales, (locale, languageId) =>
+ {
+ locale.Title = newsItem.GetTranslation(x => x.Title, languageId, false);
+ locale.Short = newsItem.GetTranslation(x => x.Short, languageId, false);
+ locale.Full = newsItem.GetTranslation(x => x.Full, languageId, false);
+ locale.MetaKeywords = newsItem.GetTranslation(x => x.MetaKeywords, languageId, false);
+ locale.MetaDescription = newsItem.GetTranslation(x => x.MetaDescription, languageId, false);
+ locale.MetaTitle = newsItem.GetTranslation(x => x.MetaTitle, languageId, false);
+ locale.SeName = newsItem.GetSeName(languageId, false);
+ });
+ return View(model);
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ [HttpPost]
+ [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]
+ public async Task<IActionResult> Edit(NewsItemModel model, bool continueEditing)
+ {
+ var newsItem = await newsService.GetNewsById(model.Id);
+ if (newsItem == null) return RedirectToAction("List");
+ if (!await scope.HasAccess(newsItem)) return RedirectToAction("Edit", new { id = newsItem.Id });
+
+ if (ModelState.IsValid)
+ {
+ if (scope.DefaultStoreId is not null) model.Stores = [scope.DefaultStoreId];
+ newsItem = await newsViewModelService.UpdateNewsItemModel(newsItem, model);
+ Success(translationService.GetResource("Admin.Content.News.NewsItems.Updated"));
+ if (continueEditing)
+ {
+ await SaveSelectedTabIndex();
+ return RedirectToAction("Edit", new { id = newsItem.Id });
+ }
+ return RedirectToAction("List");
+ }
+
+ ViewBag.AllLanguages = await languageService.GetAllLanguages(true);
+ return View(model);
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Delete)]
+ [HttpPost]
+ public async Task<IActionResult> Delete(string id)
+ {
+ var newsItem = await newsService.GetNewsById(id);
+ if (newsItem == null) return RedirectToAction("List");
+ // News-specific: denial redirects to List, NOT Edit (matches Page's precedent, not
+ // Blog/Category's own Delete target) - verified directly from Store's original source.
+ if (!await scope.HasAccess(newsItem)) return RedirectToAction("List");
+
+ await newsService.DeleteNews(newsItem);
+ Success(translationService.GetResource("Admin.Content.News.NewsItems.Deleted"));
+ return RedirectToAction("List");
+ }
+
+ #endregion
+
+ #region Comments
+
+ // Ruled fix (PR review): Admin's original returned View() here with no Comments.cshtml ever
+ // existing for News (unlike Blog, which has one) - a preexisting 500 if this GET were ever hit
+ // directly. Unreachable from the UI (the Comments tab's grid calls the POST overload only), so
+ // redirect instead of carrying the dead View() call forward.
+ public IActionResult Comments(string filterByNewsItemId) => RedirectToAction("List");
+
+ [PermissionAuthorizeAction(PermissionActionName.List)]
+ [HttpPost]
+ public async Task<IActionResult> Comments(string filterByNewsItemId, DataSourceRequest command)
+ {
+ var newsItem = await newsService.GetNewsById(filterByNewsItemId);
+ // Comments/CommentDelete are newly shared with Store in this phase; Admin's original had no
+ // check here (GlobalAdminDataScope makes CanView a no-op for Admin), but Store now needs one.
+ // CanView, not HasAccess: this is a read reachable from the same Edit screen that already lets
+ // a Store user view (not just mutate) global/multi-store news items via scope.CanView in
+ // Edit(GET) - HasAccess would wrongly deny the Comments tab for those items. An empty/missing
+ // filterByNewsItemId makes GetNewsById return null, denying here before
+ // PrepareNewsCommentModel's own no-filter branch could return every store's comments.
+ if (newsItem == null || !await scope.CanView(newsItem))
+ return ErrorForKendoGridJson("No access to this news item's comments");
+
+ var comments = await newsViewModelService.PrepareNewsCommentModel(filterByNewsItemId, command.Page, command.PageSize);
+ var gridModel = new DataSourceResult {
+ Data = comments.newsCommentModels.ToList(),
+ Total = comments.totalCount
+ };
+ return Json(gridModel);
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Delete)]
+ [HttpPost]
+ public async Task<IActionResult> CommentDelete(NewsComment model)
+ {
+ var newsItem = await newsService.GetNewsById(model.NewsItemId);
+ // Admin's original had no scope check on CommentDelete at all - but Comments/CommentDelete are
+ // newly shared with Store in this phase (fixing a live bug where Store's Edit.cshtml already
+ // rendered a Comments tab whose grid called actions that didn't exist), so this check is
+ // required for Store's benefit even though Admin's original never needed one (GlobalAdminDataScope
+ // makes it a no-op for Admin). Same pattern Blog's own CommentDelete already uses.
+ if (newsItem == null || !await scope.HasAccess(newsItem))
+ return ErrorForKendoGridJson("No access to this news item's comments");
+
+ if (ModelState.IsValid)
+ {
+ await newsViewModelService.CommentDelete(model);
+ return new JsonResult("");
+ }
+
+ return ErrorForKendoGridJson(ModelState);
+ }
+
+ #endregion
+}
diff --git a/src/Web/Grand.Web.AdminShared/Services/RoutedNewsItemDataScope.cs b/src/Web/Grand.Web.AdminShared/Services/RoutedNewsItemDataScope.cs
new file mode 100644
index 000000000..35971e3c9
--- /dev/null
+++ b/src/Web/Grand.Web.AdminShared/Services/RoutedNewsItemDataScope.cs
@@ -0,0 +1,55 @@
+#nullable enable
+
+using Grand.Domain.News;
+using Grand.Web.AdminShared.Interfaces;
+using Microsoft.AspNetCore.Http;
+
+namespace Grand.Web.AdminShared.Services;
+
+/// <summary>
+/// Resolves the correct per-host <see cref="IAdminDataScope{NewsItem}" /> implementation at
+/// request time, based on the current request's "area" route value — same fix and same reason
+/// as <see cref="RoutedCategoryDataScope"/> (see that file's doc comment): Grand.Web (the
+/// combined host) loads Admin and Store together in one DI container, so a plain
+/// AddScoped&lt;IAdminDataScope&lt;NewsItem&gt;, X&gt;() per host would silently let whichever
+/// host's StartupApplication ran last win for every area in that process.
+///
+/// No Vendor branch: Vendor has no News screen at all, so any "Vendor" (or other
+/// unrecognized/missing) area value fails closed.
+/// </summary>
+public class RoutedNewsItemDataScope(
+ IHttpContextAccessor httpContextAccessor,
+ GlobalAdminDataScope<NewsItem> globalScope,
+ StoreAdminDataScope<NewsItem> storeScope) : IAdminDataScope<NewsItem>
+{
+ private IAdminDataScope<NewsItem> Resolved
+ {
+ get
+ {
+ var area = httpContextAccessor.HttpContext?.Request.RouteValues["area"] as string;
+ return area switch {
+ "Admin" => globalScope,
+ "Store" => storeScope,
+ //fail closed: this object fronts store tenant isolation, so an unrecognized or
+ //missing area (including "Vendor" - NewsItem has no Vendor screen) must never
+ //silently resolve to the unscoped global scope
+ _ => throw new InvalidOperationException(
+ $"RoutedNewsItemDataScope: unrecognized or missing area '{area}'.")
+ };
+ }
+ }
+
+ public Task<bool> HasAccess(NewsItem entity) => Resolved.HasAccess(entity);
+
+ public Task<bool> CanView(NewsItem entity) => Resolved.CanView(entity);
+
+ public string? DefaultStoreId => Resolved.DefaultStoreId;
+
+ public string ResourceKeyPrefix => Resolved.ResourceKeyPrefix;
+
+ public bool ShowStoreSelector => Resolved.ShowStoreSelector;
+
+ public string? DefaultVendorId => Resolved.DefaultVendorId;
+
+ public bool CanFeatureOnHomepage => Resolved.CanFeatureOnHomepage;
+}
diff --git a/src/Web/Grand.Web.AdminShared/Startup/StartupApplication.cs b/src/Web/Grand.Web.AdminShared/Startup/StartupApplication.cs
index 3025bff67..f5e686798 100644
--- a/src/Web/Grand.Web.AdminShared/Startup/StartupApplication.cs
+++ b/src/Web/Grand.Web.AdminShared/Startup/StartupApplication.cs
@@ -5,6 +5,7 @@ using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Domain.Discounts;
+using Grand.Domain.News;
using Grand.Domain.Messages;
using Grand.Domain.Orders;
using Grand.Domain.Pages;
@@ -195,6 +196,12 @@ public class StartupApplication : IStartupApplication
services.AddScoped<StoreAdminDataScope<SpecificationAttribute>>();
services.AddScoped<IAdminDataScope<SpecificationAttribute>, RoutedSpecificationAttributeDataScope>();
+ // IAdminDataScope<NewsItem>: registered once here for the same reason as Category above — see
+ // RoutedNewsItemDataScope's doc comment. No Vendor scope: News has no Vendor screen.
+ services.AddScoped<GlobalAdminDataScope<NewsItem>>();
+ services.AddScoped<StoreAdminDataScope<NewsItem>>();
+ services.AddScoped<IAdminDataScope<NewsItem>, RoutedNewsItemDataScope>();
+
// IAdminDataScope<Page>: registered once here for the same reason as Category above — see
// RoutedPageDataScope's doc comment. No Vendor scope: Page has no Vendor screen.
services.AddScoped<GlobalAdminDataScope<Page>>();
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Create.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/News/Create.cshtml
similarity index 82%
rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Create.cshtml
rename to src/Web/Grand.Web.AdminShared/Views/AdminShared/News/Create.cshtml
index e22daf70e..1e57793db 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Create.cshtml
+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/News/Create.cshtml
@@ -1,9 +1,11 @@
-@model NewsItemModel
+@using Grand.Web.AdminShared.Models.News
+@model NewsItemModel
@{
//page title
ViewBag.Title = Loc["Admin.Content.News.NewsItems.AddNew"];
+ var area = ViewContext.RouteData.Values["area"]?.ToString();
}
-<form asp-area="@Constants.AreaAdmin" asp-controller="News" asp-action="Create" method="post">
+<form asp-area="@area" asp-controller="News" asp-action="Create" method="post">
<div class="row">
<div class="col-md-12">
@@ -24,7 +26,7 @@
<button class="btn btn-success" type="submit" name="save-continue">
<i class="fa fa-check-circle"></i> @Loc["Admin.Common.SaveContinue"]
</button>
- <vc:admin-widget widget-zone="news_details_buttons" additional-data="null"/>
+ <partial name="Partials/WidgetZone.DetailsButtons.Create"/>
</div>
</div>
</div>
@@ -34,4 +36,4 @@
</div>
</div>
</div>
-</form>
\ No newline at end of file
+</form>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Edit.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/News/Edit.cshtml
similarity index 84%
rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Edit.cshtml
rename to src/Web/Grand.Web.AdminShared/Views/AdminShared/News/Edit.cshtml
index 93b26d3ec..d532fb487 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Edit.cshtml
+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/News/Edit.cshtml
@@ -1,9 +1,11 @@
-@model NewsItemModel
+@using Grand.Web.AdminShared.Models.News
+@model NewsItemModel
@{
//page title
ViewBag.Title = Loc["Admin.Content.News.NewsItems.EditNewsItemDetails"];
+ var area = ViewContext.RouteData.Values["area"]?.ToString();
}
-<form asp-area="@Constants.AreaAdmin" asp-controller="News" asp-action="Edit" method="post">
+<form asp-area="@area" asp-controller="News" asp-action="Edit" method="post">
<div class="row">
<div class="col-md-12">
@@ -31,7 +33,7 @@
<span id="newsitem-delete" class="btn red">
<i class="fa fa-trash-o"></i> @Loc["Admin.Common.Delete"]
</span>
- <vc:admin-widget widget-zone="news_details_buttons" additional-data="Model"/>
+ <partial name="Partials/WidgetZone.DetailsButtons.Edit" model="Model"/>
</div>
</div>
</div>
@@ -42,4 +44,4 @@
</div>
</div>
</form>
-<admin-delete-confirmation button-id="newsitem-delete"/>
\ No newline at end of file
+<admin-delete-confirmation button-id="newsitem-delete"/>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/List.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/News/List.cshtml
similarity index 74%
rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/News/List.cshtml
rename to src/Web/Grand.Web.AdminShared/Views/AdminShared/News/List.cshtml
index a3592d6bd..85f7d2db4 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/List.cshtml
+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/News/List.cshtml
@@ -1,8 +1,10 @@
-@model NewsItemListModel
+@using Grand.Web.AdminShared.Models.News
+@model NewsItemListModel
@inject AdminAreaSettings adminAreaSettings
@{
//page title
ViewBag.Title = Loc["Admin.Content.News.NewsItems"];
+ var area = ViewContext.RouteData.Values["area"]?.ToString();
}
<div class="row">
@@ -14,33 +16,36 @@
@Loc["Admin.Content.News.NewsItems"]
</div>
<div class="actions btn-group btn-group-devided">
- <a href="@Url.Action("Create", new { area = Constants.AreaAdmin })" class="btn green">
+ <a href="@Url.Action("Create", new { area })" class="btn green">
<i class="fa fa-plus"></i><span class="d-none d-sm-inline"> @Loc["Admin.Common.AddNew"] </span>
</a>
- <vc:admin-widget widget-zone="news_list_buttons" additional-data="null"/>
+ <partial name="Partials/WidgetZone.ListButtons"/>
</div>
</div>
- <div class="x_content form">
- <div class="form-horizontal">
- <div class="form-body">
- <div class="row align-items-end mb-1">
- <div class="col-md-3 col-sm-12 col-12">
- <div class="form-group mb-0">
- <admin-label asp-for="SearchStoreId" class="d-flex flex-column align-items-start mw-100 px-0 text-left"/>
- <admin-select asp-for="SearchStoreId" asp-items="Model.AvailableStores"/>
+ @if (area == "Admin")
+ {
+ <div class="x_content form">
+ <div class="form-horizontal">
+ <div class="form-body">
+ <div class="row align-items-end mb-1">
+ <div class="col-md-3 col-sm-12 col-12">
+ <div class="form-group mb-0">
+ <admin-label asp-for="SearchStoreId" class="d-flex flex-column align-items-start mw-100 px-0 text-left"/>
+ <admin-select asp-for="SearchStoreId" asp-items="Model.AvailableStores"/>
+ </div>
</div>
- </div>
- <div class="col-md-3 col-sm-12 col-12 mt-md-0 mt-3">
- <div class="form-actions">
- <button class="btn btn-success filter-submit" id="search-newsitem">
- <i class="fa fa-search"></i> @Loc["Admin.Common.Search"]
- </button>
+ <div class="col-md-3 col-sm-12 col-12 mt-md-0 mt-3">
+ <div class="form-actions">
+ <button class="btn btn-success filter-submit" id="search-newsitem">
+ <i class="fa fa-search"></i> @Loc["Admin.Common.Search"]
+ </button>
+ </div>
</div>
</div>
</div>
</div>
</div>
- </div>
+ }
<div class="x_content">
<div class="form-horizontal">
<div class="form-body">
@@ -59,7 +64,7 @@
dataSource: {
transport: {
read: {
- url: "@Html.Raw(Url.Action("List", "News", new { area = Constants.AreaAdmin }))",
+ url: "@Html.Raw(Url.Action("List", "News", new { area }))",
type: "POST",
dataType: "json",
data: additionalData
@@ -142,10 +147,11 @@
});
function additionalData() {
- var data = {
- SearchStoreId: $('#SearchStoreId').val()
- };
+ var data = {};
+ if ($('#SearchStoreId').length) {
+ data.SearchStoreId = $('#SearchStoreId').val();
+ }
addAntiForgeryToken(data);
return data;
}
-</script>
\ No newline at end of file
+</script>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/News/Partials/CreateOrUpdate.TabComments.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/News/Partials/CreateOrUpdate.TabComments.cshtml
similarity index 86%
rename from src/Web/Grand.Web.Store/Areas/Store/Views/News/Partials/CreateOrUpdate.TabComments.cshtml
rename to src/Web/Grand.Web.AdminShared/Views/AdminShared/News/Partials/CreateOrUpdate.TabComments.cshtml
index 266dc45ae..cad52bca2 100644
--- a/src/Web/Grand.Web.Store/Areas/Store/Views/News/Partials/CreateOrUpdate.TabComments.cshtml
+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/News/Partials/CreateOrUpdate.TabComments.cshtml
@@ -1,14 +1,18 @@
-@model NewsItemModel
+@using Grand.Web.AdminShared.Models.News
+@model NewsItemModel
@inject AdminAreaSettings adminAreaSettings
-<vc:admin-widget widget-zone="news_details_comments_list" additional-data="Model"/>
+@{
+ var area = ViewContext.RouteData.Values["area"]?.ToString();
+}
+<partial name="Partials/WidgetZone.DetailsCommentsList" model="Model"/>
@if (!string.IsNullOrEmpty(Model.Id))
{
<div class="panel panel-default">
- <vc:admin-widget widget-zone="news_details_comments_top" additional-data="Model"/>
+ <partial name="Partials/WidgetZone.DetailsCommentsTop" model="Model"/>
<div class="panel-body">
<div id="comments-grid"></div>
</div>
- <vc:admin-widget widget-zone="news_details_comments_bottom" additional-data="Model"/>
+ <partial name="Partials/WidgetZone.DetailsCommentsBottom" model="Model"/>
</div>
<script>
$(document).ready(function () {
@@ -16,13 +20,13 @@
dataSource: {
transport: {
read: {
- url: "@Url.Action("Comments", "News", new { filterByNewsItemId = Model.Id, area = Constants.AreaStore })",
+ url: "@Url.Action("Comments", "News", new { filterByNewsItemId = Model.Id, area })",
type: "POST",
dataType: "json",
data: addAntiForgeryToken
},
destroy: {
- url: "@Html.Raw(Url.Action("CommentDelete", "News", new { area = Constants.AreaStore }))",
+ url: "@Html.Raw(Url.Action("CommentDelete", "News", new { area }))",
type: "POST",
dataType: "json",
data: addAntiForgeryToken
@@ -65,7 +69,7 @@
field: "CustomerId",
title: "@Loc["Admin.Content.News.Comments.Fields.Customer"]",
width: 200,
- template: '<a class="k-link" href="@Url.Action("Edit", "Customer", new { area = Constants.AreaStore })/#=CustomerId#">#:kendo.htmlEncode(CustomerInfo)#</a>'
+ template: '<a class="k-link" href="@Url.Action("Edit", "Customer", new { area })/#=CustomerId#">#:kendo.htmlEncode(CustomerInfo)#</a>'
}, {
field: "CommentTitle",
title: "@Loc["Admin.Content.News.Comments.Fields.CommentTitle"]"
@@ -93,4 +97,4 @@ else
<div class="note note-info">
@Loc["Admin.Content.News.NewsItems.SaveBeforeEdit"]
</div>
-}
\ No newline at end of file
+}
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Partials/CreateOrUpdate.TabInfo.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/News/Partials/CreateOrUpdate.TabInfo.cshtml
similarity index 82%
rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Partials/CreateOrUpdate.TabInfo.cshtml
rename to src/Web/Grand.Web.AdminShared/Views/AdminShared/News/Partials/CreateOrUpdate.TabInfo.cshtml
index b77a341c1..a94543896 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Partials/CreateOrUpdate.TabInfo.cshtml
+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/News/Partials/CreateOrUpdate.TabInfo.cshtml
@@ -1,7 +1,9 @@
-@using Microsoft.AspNetCore.Mvc.Razor
+@using Microsoft.AspNetCore.Mvc.Razor
+@using Grand.Web.AdminShared.Models.News
@model NewsItemModel
@{
+ var area = ViewContext.RouteData.Values["area"]?.ToString();
Func<int, HelperResult>
template = @<div class="form-body">
<div class="form-group">
@@ -30,7 +32,7 @@
}
<div class="form-horizontal">
- <vc:admin-widget widget-zone="news_details_info_top" additional-data="Model"/>
+ <partial name="Partials/WidgetZone.DetailsInfoTop" model="Model"/>
<div class="form-body">
<localized-editor localized-template="@template" name="newsitem-info-localized" language-ids="@Model.Locales.Select(c => c.LanguageId).ToList()">
<div class="form-group">
@@ -96,20 +98,23 @@
<span asp-validation-for="Published"></span>
</div>
</div>
- <div class="form-group">
- <admin-label asp-for="CustomerGroups"/>
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="CustomerGroups"/>
- <span asp-validation-for="CustomerGroups"></span>
+ @if (area == "Admin")
+ {
+ <div class="form-group">
+ <admin-label asp-for="CustomerGroups"/>
+ <div class="col-md-9 col-sm-9">
+ <admin-input asp-for="CustomerGroups"/>
+ <span asp-validation-for="CustomerGroups"></span>
+ </div>
</div>
- </div>
- <div class="form-group">
- <admin-label asp-for="Stores"/>
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="Stores"/>
- <span asp-validation-for="Stores"></span>
+ <div class="form-group">
+ <admin-label asp-for="Stores"/>
+ <div class="col-md-9 col-sm-9">
+ <admin-input asp-for="Stores"/>
+ <span asp-validation-for="Stores"></span>
+ </div>
</div>
- </div>
+ }
</div>
- <vc:admin-widget widget-zone="news_details_info_bottom" additional-data="Model"/>
-</div>
\ No newline at end of file
+ <partial name="Partials/WidgetZone.DetailsInfoBottom" model="Model"/>
+</div>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/News/Partials/CreateOrUpdate.TabSeo.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/News/Partials/CreateOrUpdate.TabSeo.cshtml
similarity index 94%
rename from src/Web/Grand.Web.Store/Areas/Store/Views/News/Partials/CreateOrUpdate.TabSeo.cshtml
rename to src/Web/Grand.Web.AdminShared/Views/AdminShared/News/Partials/CreateOrUpdate.TabSeo.cshtml
index 2f504cbfe..2ffe7921d 100644
--- a/src/Web/Grand.Web.Store/Areas/Store/Views/News/Partials/CreateOrUpdate.TabSeo.cshtml
+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/News/Partials/CreateOrUpdate.TabSeo.cshtml
@@ -1,7 +1,8 @@
-@using Microsoft.AspNetCore.Mvc.Razor
+@using Microsoft.AspNetCore.Mvc.Razor
+@using Grand.Web.AdminShared.Models.News
@model NewsItemModel
-<vc:admin-widget widget-zone="news_details_seo_top" additional-data="Model"/>
+<partial name="Partials/WidgetZone.DetailsSeoTop" model="Model"/>
@{
Func<int, HelperResult>
template = @<div class="form-body">
@@ -72,4 +73,4 @@
</localized-editor>
</div>
-<vc:admin-widget widget-zone="news_details_seo_bottom" additional-data="Model"/>
\ No newline at end of file
+<partial name="Partials/WidgetZone.DetailsSeoBottom" model="Model"/>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Partials/CreateOrUpdate.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/News/Partials/CreateOrUpdate.cshtml
similarity index 86%
rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Partials/CreateOrUpdate.cshtml
rename to src/Web/Grand.Web.AdminShared/Views/AdminShared/News/Partials/CreateOrUpdate.cshtml
index 9e3c8074e..d5979b723 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Partials/CreateOrUpdate.cshtml
+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/News/Partials/CreateOrUpdate.cshtml
@@ -1,4 +1,5 @@
-@model NewsItemModel
+@using Grand.Web.AdminShared.Models.News
+@model NewsItemModel
<div asp-validation-summary="All"></div>
<input asp-for="Id" type="hidden"/>
@@ -25,6 +26,6 @@
</div>
</content>
</tabstrip-item>
- <vc:admin-widget widget-zone="news_details_tabs" additional-data="Model"/>
+ <partial name="Partials/WidgetZone.DetailsTabs" model="Model"/>
</items>
-</admin-tabstrip>
\ No newline at end of file
+</admin-tabstrip>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/News/Create.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/News/Create.cshtml
deleted file mode 100644
index 53e393735..000000000
--- a/src/Web/Grand.Web.Store/Areas/Store/Views/News/Create.cshtml
+++ /dev/null
@@ -1,38 +0,0 @@
-@model NewsItemModel
-@{
- //page title
- ViewBag.Title = Loc["Admin.Content.News.NewsItems.AddNew"];
- Layout = Constants.LayoutStore;
-}
-<form asp-area="@Constants.AreaStore" asp-controller="News" asp-action="Create" method="post">
-
- <div class="row">
- <div class="col-md-12">
- <div class="x_panel light form-fit">
- <div class="x_title">
- <div class="caption">
- <i class="fa fa-hacker-news"></i>
- @Loc["Admin.Content.News.NewsItems.AddNew"]
- <small>
- <i class="fa fa-arrow-circle-left"></i>@Html.ActionLink(Loc["Admin.Content.News.NewsItems.BackToList"], "List")
- </small>
- </div>
- <div class="actions">
- <div class="btn-group btn-group-devided">
- <button class="btn btn-success" type="submit" name="save">
- <i class="fa fa-check"></i> @Loc["Admin.Common.Save"]
- </button>
- <button class="btn btn-success" type="submit" name="save-continue">
- <i class="fa fa-check-circle"></i> @Loc["Admin.Common.SaveContinue"]
- </button>
- <vc:admin-widget widget-zone="news_details_buttons" additional-data="null"/>
- </div>
- </div>
- </div>
- <div class="x_content form">
- <partial name="Partials/CreateOrUpdate" model="Model"/>
- </div>
- </div>
- </div>
- </div>
-</form>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/News/Edit.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/News/Edit.cshtml
deleted file mode 100644
index 2e2ea0f40..000000000
--- a/src/Web/Grand.Web.Store/Areas/Store/Views/News/Edit.cshtml
+++ /dev/null
@@ -1,46 +0,0 @@
-@model NewsItemModel
-@{
- //page title
- ViewBag.Title = Loc["Admin.Content.News.NewsItems.EditNewsItemDetails"];
- Layout = Constants.LayoutStore;
-}
-<form asp-area="@Constants.AreaStore" asp-controller="News" asp-action="Edit" method="post">
-
- <div class="row">
- <div class="col-md-12">
- <div class="x_panel light form-fit">
- <div class="x_title">
- <div class="caption">
- <i class="fa fa-hacker-news"></i>
- @Loc["Admin.Content.News.NewsItems.EditNewsItemDetails"] - @Model.Title
- <small>
- <i class="fa fa-arrow-circle-left"></i>@Html.ActionLink(Loc["Admin.Content.News.NewsItems.BackToList"], "List")
- </small>
- </div>
- <div class="actions">
- <div class="btn-group btn-group-devided">
- <button type="button" onclick="window.open('@Url.RouteUrl("NewsItem", new { Model.SeName })','_blank');" class="btn purple">
- <i class="fa fa-eye"></i>
- @Loc["Admin.Common.Preview"]
- </button>
- <button class="btn btn-success" type="submit" name="save">
- <i class="fa fa-check"></i> @Loc["Admin.Common.Save"]
- </button>
- <button class="btn btn-success" type="submit" name="save-continue">
- <i class="fa fa-check-circle"></i> @Loc["Admin.Common.SaveContinue"]
- </button>
- <span id="newsitem-delete" class="btn red">
- <i class="fa fa-trash-o"></i> @Loc["Admin.Common.Delete"]
- </span>
- <vc:admin-widget widget-zone="news_details_buttons" additional-data="Model"/>
- </div>
- </div>
- </div>
- <div class="x_content form">
- <partial name="Partials/CreateOrUpdate" model="Model"/>
- </div>
- </div>
- </div>
- </div>
-</form>
-<admin-delete-confirmation button-id="newsitem-delete"/>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/News/List.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/News/List.cshtml
deleted file mode 100644
index c2eb9c2c0..000000000
--- a/src/Web/Grand.Web.Store/Areas/Store/Views/News/List.cshtml
+++ /dev/null
@@ -1,131 +0,0 @@
-@model NewsItemListModel
-@inject AdminAreaSettings adminAreaSettings
-@{
- //page title
- ViewBag.Title = Loc["Admin.Content.News.NewsItems"];
- Layout = Constants.LayoutStore;
-}
-
-<div class="row">
- <div class="col-md-12">
- <div class="x_panel light form-fit">
- <div class="x_title">
- <div class="caption">
- <i class="fa fa-hacker-news"></i>
- @Loc["Admin.Content.News.NewsItems"]
- </div>
- <div class="actions btn-group btn-group-devided">
- <a href="@Url.Action("Create", new { area = Constants.AreaStore })" class="btn green">
- <i class="fa fa-plus"></i><span class="d-none d-sm-inline"> @Loc["Admin.Common.AddNew"] </span>
- </a>
- <vc:admin-widget widget-zone="news_list_buttons" additional-data="null" />
- </div>
- </div>
- <div class="x_content">
- <div class="form-horizontal">
- <div class="form-body">
- <div class="x_content">
- <div id="newsitem-grid"></div>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
-</div>
-<script>
- $(document).ready(function () {
- $("#newsitem-grid").kendoGrid({
- dataSource: {
- transport: {
- read: {
- url: "@Html.Raw(Url.Action("List", "News", new { area = Constants.AreaStore }))",
- type: "POST",
- dataType: "json",
- data: additionalData
- }
- },
- schema: {
- data: "Data",
- total: "Total",
- errors: "Errors"
- },
- error: function(e) {
- display_kendoui_grid_error(e);
- // Cancel the changes
- this.cancelChanges();
- },
- pageSize: @(adminAreaSettings.DefaultGridPageSize),
- serverPaging: true,
- serverFiltering: true,
- serverSorting: true
- },
- pageable: {
- refresh: true,
- pageSizes: [@(adminAreaSettings.GridPageSizes)]
- },
- editable: {
- confirmation: false,
- mode: "inline"
- },
- scrollable: false,
- columns: [{
- field: "Title",
- width: 300,
- title: "@Loc["Admin.Content.News.NewsItems.Fields.Title"]",
- template: '<a class="k-link" href="Edit/#=Id#">#=kendo.htmlEncode(Title)#</a>',
- }, {
- field: "Comments",
- title: "@Loc["Admin.Content.News.NewsItems.Fields.Comments"]",
- width: 200,
- template: '<a class="k-link" href="Edit/#=Id#">@Loc["Admin.Content.News.NewsItems.Fields.Comments"] - #=Comments# </a>'
- }, {
- field: "StartDate",
- title: "@Loc["Admin.Content.News.NewsItems.Fields.StartDate"]",
- width: 150,
- type: "date",
- format: "{0:G}"
- }, {
- field: "EndDate",
- title: "@Loc["Admin.Content.News.NewsItems.Fields.EndDate"]",
- width: 150,
- type: "date",
- format: "{0:G}"
- }, {
- field: "Published",
- title: "@Loc["Admin.Content.News.NewsItems.Fields.Published"]",
- width: 100,
- headerAttributes: { style: "text-align:center" },
- attributes: { style: "text-align:center" },
- template: '# if(Published) {# <i class="fa fa-check" aria-hidden="true" style="color:green"></i> #} else {# <i class="fa fa-times" aria-hidden="true" style="color:red"></i> #} #'
- }, {
- field: "CreatedOn",
- title: "@Loc["Admin.Content.News.NewsItems.Fields.CreatedOn"]",
- width: 200,
- type: "date",
- format: "{0:G}"
- }]
- });
- });
-</script>
-<script>
-
- $(document).ready(function () {
- //search button
- $('#search-newsitem').click(function () {
- //search
- var grid = $('#newsitem-grid').data('kendoGrid');
- grid.dataSource.page(1); //new search. Set page size to 1
- //grid.dataSource.read(); we already loaded the grid above using "page" function
- return false;
- });
- });
-
- function additionalData() {
- var data = {
- SearchNewsTitle: ''
- };
- addAntiForgeryToken(data);
- return data;
- }
-</script>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/News/Partials/CreateOrUpdate.TabInfo.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/News/Partials/CreateOrUpdate.TabInfo.cshtml
deleted file mode 100644
index c0a489daa..000000000
--- a/src/Web/Grand.Web.Store/Areas/Store/Views/News/Partials/CreateOrUpdate.TabInfo.cshtml
+++ /dev/null
@@ -1,101 +0,0 @@
-@using Microsoft.AspNetCore.Mvc.Razor
-@model NewsItemModel
-
-@{
- Func<int, HelperResult>
- template = @<div class="form-body">
- <div class="form-group">
- <admin-label asp-for="@Model.Locales[item].Title"/>
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="@Model.Locales[item].Title"/>
- <span asp-validation-for="@Model.Locales[item].Title"></span>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="@Model.Locales[item].Short"/>
- <div class="col-md-9 col-sm-9">
- <admin-textarea asp-for="@Model.Locales[item].Short"></admin-textarea>
- <span asp-validation-for="@Model.Locales[item].Short"></span>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="@Model.Locales[item].Full"/>
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="@Model.Locales[item].Full" asp-template="Editor"/>
- <span asp-validation-for="@Model.Locales[item].Full"></span>
- </div>
- </div>
- <input asp-for="Locales[item].LanguageId" type="hidden"/>
- </div>;
-}
-
-<div class="form-horizontal">
- <vc:admin-widget widget-zone="news_details_info_top" additional-data="Model"/>
- <div class="form-body">
- <localized-editor localized-template="@template" name="newsitem-info-localized" language-ids="@Model.Locales.Select(c => c.LanguageId).ToList()">
- <div class="form-group">
- <admin-label asp-for="Title"/>
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="Title"/>
- <span asp-validation-for="Title"></span>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="Short"/>
- <div class="col-md-9 col-sm-9">
- <admin-textarea asp-for="Short"></admin-textarea>
- <span asp-validation-for="Short"></span>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="Full"/>
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="Full" asp-template="Editor"/>
- <span asp-validation-for="Full"></span>
- </div>
- </div>
- </localized-editor>
- <div class="form-group">
- <admin-label asp-for="PictureId"/>
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="PictureId"/>
- <span asp-validation-for="PictureId"></span>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="AllowComments"/>
- <div class="col-md-9 col-sm-9">
- <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
- <admin-input asp-for="AllowComments"/>
- <div class="control__indicator"></div>
- </label>
- <span asp-validation-for="AllowComments"></span>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="StartDate"/>
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="StartDate"/>
- <span asp-validation-for="StartDate"></span>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="EndDate"/>
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="EndDate"/>
- <span asp-validation-for="EndDate"></span>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="Published"/>
- <div class="col-md-9 col-sm-9">
- <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
- <admin-input asp-for="Published"/>
- <div class="control__indicator"></div>
- </label>
- <span asp-validation-for="Published"></span>
- </div>
- </div>
- </div>
- <vc:admin-widget widget-zone="news_details_info_bottom" additional-data="Model"/>
-</div>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/News/Partials/CreateOrUpdate.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/News/Partials/CreateOrUpdate.cshtml
deleted file mode 100644
index 9e3c8074e..000000000
--- a/src/Web/Grand.Web.Store/Areas/Store/Views/News/Partials/CreateOrUpdate.cshtml
+++ /dev/null
@@ -1,30 +0,0 @@
-@model NewsItemModel
-
-<div asp-validation-summary="All"></div>
-<input asp-for="Id" type="hidden"/>
-<admin-tabstrip name="news-edit">
- <items>
- <tabstrip-item text="@Loc["Admin.Content.News.NewsItems.Info"]" tab-index="0">
- <content>
- <div>
- <partial name="Partials/CreateOrUpdate.TabInfo" model="Model"/>
- </div>
- </content>
- </tabstrip-item>
- <tabstrip-item text="@Loc["Admin.Common.SEO"]" tab-index="1">
- <content>
- <div>
- <partial name="Partials/CreateOrUpdate.TabSeo" model="Model"/>
- </div>
- </content>
- </tabstrip-item>
- <tabstrip-item text="@Loc["Admin.Content.News.NewsItems.Comments"]" tab-index="2">
- <content>
- <div>
- <partial name="Partials/CreateOrUpdate.TabComments" model="Model"/>
- </div>
- </content>
- </tabstrip-item>
- <vc:admin-widget widget-zone="news_details_tabs" additional-data="Model"/>
- </items>
-</admin-tabstrip>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/News/Partials/WidgetZone.DetailsButtons.Create.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/News/Partials/WidgetZone.DetailsButtons.Create.cshtml
new file mode 100644
index 000000000..82f820939
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/News/Partials/WidgetZone.DetailsButtons.Create.cshtml
@@ -0,0 +1 @@
+<vc:store-widget widget-zone="store_news_details_buttons" additional-data="null"/>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/News/Partials/WidgetZone.DetailsButtons.Edit.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/News/Partials/WidgetZone.DetailsButtons.Edit.cshtml
new file mode 100644
index 000000000..0e19ff071
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/News/Partials/WidgetZone.DetailsButtons.Edit.cshtml
@@ -0,0 +1,3 @@
+@using Grand.Web.AdminShared.Models.News
+@model NewsItemModel
+<vc:store-widget widget-zone="store_news_details_buttons" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/News/Partials/WidgetZone.DetailsCommentsBottom.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/News/Partials/WidgetZone.DetailsCommentsBottom.cshtml
new file mode 100644
index 000000000..9c1b0796e
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/News/Partials/WidgetZone.DetailsCommentsBottom.cshtml
@@ -0,0 +1,3 @@
+@using Grand.Web.AdminShared.Models.News
+@model NewsItemModel
+<vc:store-widget widget-zone="store_news_details_comments_bottom" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/News/Partials/WidgetZone.DetailsCommentsList.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/News/Partials/WidgetZone.DetailsCommentsList.cshtml
new file mode 100644
index 000000000..3c1134921
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/News/Partials/WidgetZone.DetailsCommentsList.cshtml
@@ -0,0 +1,3 @@
+@using Grand.Web.AdminShared.Models.News
+@model NewsItemModel
+<vc:store-widget widget-zone="store_news_details_comments_list" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/News/Partials/WidgetZone.DetailsCommentsTop.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/News/Partials/WidgetZone.DetailsCommentsTop.cshtml
new file mode 100644
index 000000000..bf9e08c60
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/News/Partials/WidgetZone.DetailsCommentsTop.cshtml
@@ -0,0 +1,3 @@
+@using Grand.Web.AdminShared.Models.News
+@model NewsItemModel
+<vc:store-widget widget-zone="store_news_details_comments_top" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/News/Partials/WidgetZone.DetailsInfoBottom.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/News/Partials/WidgetZone.DetailsInfoBottom.cshtml
new file mode 100644
index 000000000..62f90d6df
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/News/Partials/WidgetZone.DetailsInfoBottom.cshtml
@@ -0,0 +1,3 @@
+@using Grand.Web.AdminShared.Models.News
+@model NewsItemModel
+<vc:store-widget widget-zone="store_news_details_info_bottom" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/News/Partials/WidgetZone.DetailsInfoTop.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/News/Partials/WidgetZone.DetailsInfoTop.cshtml
new file mode 100644
index 000000000..e3527cc9e
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/News/Partials/WidgetZone.DetailsInfoTop.cshtml
@@ -0,0 +1,3 @@
+@using Grand.Web.AdminShared.Models.News
+@model NewsItemModel
+<vc:store-widget widget-zone="store_news_details_info_top" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/News/Partials/WidgetZone.DetailsSeoBottom.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/News/Partials/WidgetZone.DetailsSeoBottom.cshtml
new file mode 100644
index 000000000..042ab2200
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/News/Partials/WidgetZone.DetailsSeoBottom.cshtml
@@ -0,0 +1,3 @@
+@using Grand.Web.AdminShared.Models.News
+@model NewsItemModel
+<vc:store-widget widget-zone="store_news_details_seo_bottom" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/News/Partials/WidgetZone.DetailsSeoTop.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/News/Partials/WidgetZone.DetailsSeoTop.cshtml
new file mode 100644
index 000000000..35f1b1f32
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/News/Partials/WidgetZone.DetailsSeoTop.cshtml
@@ -0,0 +1,3 @@
+@using Grand.Web.AdminShared.Models.News
+@model NewsItemModel
+<vc:store-widget widget-zone="store_news_details_seo_top" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/News/Partials/WidgetZone.DetailsTabs.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/News/Partials/WidgetZone.DetailsTabs.cshtml
new file mode 100644
index 000000000..ecbc510c1
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/News/Partials/WidgetZone.DetailsTabs.cshtml
@@ -0,0 +1,3 @@
+@using Grand.Web.AdminShared.Models.News
+@model NewsItemModel
+<vc:store-widget widget-zone="store_news_details_tabs" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/News/Partials/WidgetZone.ListButtons.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/News/Partials/WidgetZone.ListButtons.cshtml
new file mode 100644
index 000000000..3cbcb5a33
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/News/Partials/WidgetZone.ListButtons.cshtml
@@ -0,0 +1 @@
+<vc:store-widget widget-zone="store_news_list_buttons" additional-data="null"/>
diff --git a/src/Web/Grand.Web.Store/Controllers/NewsController.cs b/src/Web/Grand.Web.Store/Controllers/NewsController.cs
index e931e9288..a5012ac11 100644
--- a/src/Web/Grand.Web.Store/Controllers/NewsController.cs
+++ b/src/Web/Grand.Web.Store/Controllers/NewsController.cs
@@ -1,235 +1,61 @@
using Grand.Business.Core.Extensions;
using Grand.Business.Core.Interfaces.Cms;
-using Grand.Business.Core.Interfaces.Common.Configuration;
using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Stores;
using Grand.Domain.News;
using Grand.Domain.Permissions;
-using Grand.Infrastructure;
-using Grand.Web.AdminShared.Extensions;
+using Grand.Web.AdminShared.Controllers;
using Grand.Web.AdminShared.Extensions.Mapping;
using Grand.Web.AdminShared.Interfaces;
-using Grand.Web.AdminShared.Models.News;
-using Grand.Web.Common.DataSource;
using Grand.Web.Common.Filters;
using Grand.Web.Common.Security.Authorization;
+using Grand.Web.Store.Extensions;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Store.Controllers;
-[PermissionAuthorize(PermissionSystemName.News)]
-public class NewsController : BaseStoreController
+// Reduced to a thin subclass of BaseNewsController (ARCH-001 News consolidation). All shared
+// behavior lives in the base; this class supplies Store's DI wiring, the EditWarningCheck hook, and
+// the kept Preview action (Admin has no equivalent). Same pattern as CategoryController's
+// EditWarningCheck override (see that file).
+[AutoValidateAntiforgeryToken]
+[Area(Constants.AreaStore)]
+[AuthorizeStore]
+[AuthorizeMenu]
+public class NewsController(
+ INewsViewModelService newsViewModelService,
+ INewsService newsService,
+ ILanguageService languageService,
+ ITranslationService translationService,
+ IStoreService storeService,
+ IDateTimeService dateTimeService,
+ IAdminDataScope<NewsItem> scope)
+ : BaseNewsController(newsViewModelService, newsService, languageService, translationService,
+ storeService, dateTimeService, scope)
{
- #region Constructors
-
- public NewsController(
- INewsViewModelService newsViewModelService,
- INewsService newsService,
- ILanguageService languageService,
- ITranslationService translationService,
- ISettingService settingService,
- IDateTimeService dateTimeService,
- IContextAccessor contextAccessor)
- {
- _newsViewModelService = newsViewModelService;
- _newsService = newsService;
- _languageService = languageService;
- _translationService = translationService;
- _settingService = settingService;
- _dateTimeService = dateTimeService;
- _contextAccessor = contextAccessor;
- }
-
- #endregion
-
- #region Fields
-
- private readonly INewsViewModelService _newsViewModelService;
- private readonly INewsService _newsService;
- private readonly ILanguageService _languageService;
- private readonly ITranslationService _translationService;
- private readonly ISettingService _settingService;
- private readonly IDateTimeService _dateTimeService;
- private readonly IContextAccessor _contextAccessor;
-
- #endregion
-
- #region News items
-
- public IActionResult Index()
- {
- return RedirectToAction("List");
- }
-
- public IActionResult List()
- {
- var model = new NewsItemListModel();
- return View(model);
- }
-
- [PermissionAuthorizeAction(PermissionActionName.List)]
- [HttpPost]
- public async Task<IActionResult> List(DataSourceRequest command, NewsItemListModel model)
- {
- var storeId = _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId;
- var newsSettings = await _settingService.LoadSetting<NewsSettings>(storeId);
-
- var news = await _newsService.GetAllNews(storeId, command.Page - 1, command.PageSize, newsTitle: model.SearchNewsTitle);
-
- var gridModel = new DataSourceResult {
- Data = news.Select(x =>
- {
- var m = x.ToModel(_dateTimeService);
- m.Full = "";
- m.CreatedOn = _dateTimeService.ConvertToUserTime(x.CreatedOnUtc, DateTimeKind.Utc);
- m.Comments = x.CommentCount;
- return m;
- }).ToList(),
- Total = news.TotalCount
- };
- return Json(gridModel);
- }
-
- [PermissionAuthorizeAction(PermissionActionName.Create)]
- public async Task<IActionResult> Create()
- {
- var model = new NewsItemModel {
- //default values
- Published = true,
- AllowComments = true
- };
-
- //locales
- await AddLocales(_languageService, model.Locales);
- return View(model);
- }
-
- [PermissionAuthorizeAction(PermissionActionName.Edit)]
- [HttpPost]
- [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]
- public async Task<IActionResult> Create(NewsItemModel model, bool continueEditing)
- {
- if (ModelState.IsValid)
- {
- model.Stores = [_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId];
- var newsItem = await _newsViewModelService.InsertNewsItemModel(model);
- await _newsService.UpdateNews(newsItem);
-
- Success(_translationService.GetResource("Admin.Content.News.NewsItems.Added"));
- return continueEditing ? RedirectToAction("Edit", new { id = newsItem.Id }) : RedirectToAction("List");
- }
-
- //If we got this far, something failed, redisplay form
- return View(model);
- }
-
- [PermissionAuthorizeAction(PermissionActionName.Preview)]
- public async Task<IActionResult> Edit(string id)
- {
- var newsItem = await _newsService.GetNewsById(id);
- if (newsItem == null)
- //No news item found with the specified id
- return RedirectToAction("List");
-
- if (!newsItem.LimitedToStores || (newsItem.LimitedToStores &&
- newsItem.Stores.Contains(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId) &&
- newsItem.Stores.Count > 1))
- {
- Warning(_translationService.GetResource("Admin.Content.News.Permissions"));
- }
- else
- {
- if (!newsItem.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))
- return RedirectToAction("List");
- }
-
- var model = newsItem.ToModel(_dateTimeService);
- //locales
- await AddLocales(_languageService, model.Locales, (locale, languageId) =>
- {
- locale.Title = newsItem.GetTranslation(x => x.Title, languageId, false);
- locale.Short = newsItem.GetTranslation(x => x.Short, languageId, false);
- locale.Full = newsItem.GetTranslation(x => x.Full, languageId, false);
- locale.MetaKeywords = newsItem.GetTranslation(x => x.MetaKeywords, languageId, false);
- locale.MetaDescription = newsItem.GetTranslation(x => x.MetaDescription, languageId, false);
- locale.MetaTitle = newsItem.GetTranslation(x => x.MetaTitle, languageId, false);
- locale.SeName = newsItem.GetSeName(languageId, false);
- });
- return View(model);
- }
-
- [PermissionAuthorizeAction(PermissionActionName.Edit)]
- [HttpPost]
- [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]
- public async Task<IActionResult> Edit(NewsItemModel model, bool continueEditing)
- {
- var newsItem = await _newsService.GetNewsById(model.Id);
- if (newsItem == null)
- //No news item found with the specified id
- return RedirectToAction("List");
-
- if (!newsItem.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))
- return RedirectToAction("Edit", new { id = newsItem.Id });
-
- if (ModelState.IsValid)
- {
- model.Stores = [_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId];
- newsItem = await _newsViewModelService.UpdateNewsItemModel(newsItem, model);
- Success(_translationService.GetResource("Admin.Content.News.NewsItems.Updated"));
-
- if (continueEditing)
- {
- //selected tab
- await SaveSelectedTabIndex();
-
- return RedirectToAction("Edit", new { id = newsItem.Id });
- }
-
- return RedirectToAction("List");
- }
-
- //If we got this far, something failed, redisplay form
-
- return View(model);
- }
-
- [PermissionAuthorizeAction(PermissionActionName.Delete)]
- [HttpPost]
- public async Task<IActionResult> Delete(string id)
+ // Re-derived from the original Store NewsController.Edit(GET) - the condition is unusual (warns
+ // when NOT limited to stores at all, or when limited AND the staff member's store is one of
+ // several) and easy to get backwards. Fourth occurrence of this exact idiom in ARCH-001
+ // (Category, Blog, Page, now News) - treat as proven.
+ protected override void EditWarningCheck(NewsItem newsItem)
{
- var newsItem = await _newsService.GetNewsById(id);
- if (newsItem == null)
- //No news item found with the specified id
- return RedirectToAction("List");
-
- if (!newsItem.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))
- return RedirectToAction("List");
-
- if (ModelState.IsValid)
- {
- await _newsService.DeleteNews(newsItem);
-
- Success(_translationService.GetResource("Admin.Content.News.NewsItems.Deleted"));
- return RedirectToAction("List");
- }
-
- Error(ModelState);
- return RedirectToAction("Edit", new { id = newsItem.Id });
+ if (!newsItem.LimitedToStores ||
+ (newsItem.Stores.Contains(Scope.DefaultStoreId) &&
+ newsItem.Stores.Count > 1))
+ Warning(TranslationService.GetResource("Admin.Content.News.Permissions"));
}
+ // Admin has no equivalent action - a genuine Store-only addition, kept on the concrete subclass
+ // rather than the shared base.
[PermissionAuthorizeAction(PermissionActionName.Preview)]
public async Task<IActionResult> Preview(string id)
{
- var newsItem = await _newsService.GetNewsById(id);
- if (newsItem == null)
- return RedirectToAction("List");
-
- if (!newsItem.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))
- return RedirectToAction("List");
+ var newsItem = await newsService.GetNewsById(id);
+ if (newsItem == null) return RedirectToAction("List");
+ if (!await Scope.HasAccess(newsItem)) return RedirectToAction("List");
- var model = newsItem.ToModel(_dateTimeService);
+ var model = newsItem.ToModel(dateTimeService);
return View(model);
}
-
- #endregion
-}
\ No newline at end of file
+}