From 3a924430d2d1109bdd1ca5caf9fc33baae7b483f Mon Sep 17 00:00:00 2001 From: skewed Date: Thu, 21 Jan 2010 21:59:57 +0000 Subject: [PATCH] Changing page delete action to use the id instead of slug --HG-- extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4045805 --- .../Packages/Orchard.Pages/Controllers/AdminController.cs | 4 ++-- .../Packages/Orchard.Pages/Services/IPageService.cs | 1 + .../Packages/Orchard.Pages/Services/PageService.cs | 4 ++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Orchard.Web/Packages/Orchard.Pages/Controllers/AdminController.cs b/src/Orchard.Web/Packages/Orchard.Pages/Controllers/AdminController.cs index 82b3b6e7d..cd93c7937 100644 --- a/src/Orchard.Web/Packages/Orchard.Pages/Controllers/AdminController.cs +++ b/src/Orchard.Web/Packages/Orchard.Pages/Controllers/AdminController.cs @@ -220,11 +220,11 @@ namespace Orchard.Pages.Controllers { } [HttpPost] - public ActionResult Delete(string pageSlug) { + public ActionResult Delete(int id) { if (!_services.Authorizer.Authorize(Permissions.DeletePages, T("Couldn't delete page"))) return new HttpUnauthorizedResult(); - Page page = _pageService.Get(pageSlug); + Page page = _pageService.Get(id); if (page == null) return new NotFoundResult(); diff --git a/src/Orchard.Web/Packages/Orchard.Pages/Services/IPageService.cs b/src/Orchard.Web/Packages/Orchard.Pages/Services/IPageService.cs index 0266511b3..ebb0c113e 100644 --- a/src/Orchard.Web/Packages/Orchard.Pages/Services/IPageService.cs +++ b/src/Orchard.Web/Packages/Orchard.Pages/Services/IPageService.cs @@ -7,6 +7,7 @@ namespace Orchard.Pages.Services { IEnumerable Get(); IEnumerable Get(PageStatus status); Page Get(string slug); + Page Get(int id); Page GetPageOrDraft(string slug); Page GetPageOrDraft(int id); Page GetLatest(string slug); diff --git a/src/Orchard.Web/Packages/Orchard.Pages/Services/PageService.cs b/src/Orchard.Web/Packages/Orchard.Pages/Services/PageService.cs index 15284d60f..274f437ad 100644 --- a/src/Orchard.Web/Packages/Orchard.Pages/Services/PageService.cs +++ b/src/Orchard.Web/Packages/Orchard.Pages/Services/PageService.cs @@ -38,6 +38,10 @@ namespace Orchard.Pages.Services { return contentItems.Select(ci => ci.As()); } + public Page Get(int id) { + return _contentManager.Get(id); + } + public Page Get(string slug) { return _contentManager.Query("page").Join().Where(rr => rr.Slug == slug).List().FirstOrDefault