diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostAdminController.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostAdminController.cs index 2022dd933..556a3c151 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostAdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostAdminController.cs @@ -95,7 +95,7 @@ namespace Orchard.Blogs.Controllers { if (post == null) return HttpNotFound(); - if (!Services.Authorizer.Authorize(Permissions.EditOthersBlogPost, post, T("Couldn't edit blog post"))) + if (!Services.Authorizer.Authorize(Permissions.EditBlogPost, post, T("Couldn't edit blog post"))) return new HttpUnauthorizedResult(); dynamic model = Services.ContentManager.BuildEditor(post); @@ -124,7 +124,7 @@ namespace Orchard.Blogs.Controllers { if (blogPost == null) return HttpNotFound(); - if (!Services.Authorizer.Authorize(Permissions.PublishOthersBlogPost, blogPost, T("Couldn't publish blog post"))) + if (!Services.Authorizer.Authorize(Permissions.PublishBlogPost, blogPost, T("Couldn't publish blog post"))) return new HttpUnauthorizedResult(); return EditPOST(blogId, postId, returnUrl, contentItem => Services.ContentManager.Publish(contentItem)); @@ -140,7 +140,7 @@ namespace Orchard.Blogs.Controllers { if (blogPost == null) return HttpNotFound(); - if (!Services.Authorizer.Authorize(Permissions.EditOthersBlogPost, blogPost, T("Couldn't edit blog post"))) + if (!Services.Authorizer.Authorize(Permissions.EditBlogPost, blogPost, T("Couldn't edit blog post"))) return new HttpUnauthorizedResult(); // Validate form input @@ -167,7 +167,7 @@ namespace Orchard.Blogs.Controllers { } // check edit permission - if (!Services.Authorizer.Authorize(Permissions.EditOthersBlogPost, draft, T("Couldn't discard blog post draft"))) + if (!Services.Authorizer.Authorize(Permissions.EditBlogPost, draft, T("Couldn't discard blog post draft"))) return new HttpUnauthorizedResult(); // locate the published revision to revert onto @@ -198,7 +198,7 @@ namespace Orchard.Blogs.Controllers { [ValidateAntiForgeryTokenOrchard] public ActionResult Delete(int blogId, int postId) { - //refactoring: test PublishBlogPost/PublishOthersBlogPost in addition if published + //refactoring: test PublishBlogPost/PublishBlogPost in addition if published var blog = _blogService.Get(blogId, VersionOptions.Latest); if (blog == null) @@ -208,7 +208,7 @@ namespace Orchard.Blogs.Controllers { if (post == null) return HttpNotFound(); - if (!Services.Authorizer.Authorize(Permissions.DeleteOthersBlogPost, post, T("Couldn't delete blog post"))) + if (!Services.Authorizer.Authorize(Permissions.DeleteBlogPost, post, T("Couldn't delete blog post"))) return new HttpUnauthorizedResult(); _blogPostService.Delete(post); @@ -227,7 +227,7 @@ namespace Orchard.Blogs.Controllers { if (post == null) return HttpNotFound(); - if (!Services.Authorizer.Authorize(Permissions.PublishOthersBlogPost, post, T("Couldn't publish blog post"))) + if (!Services.Authorizer.Authorize(Permissions.PublishBlogPost, post, T("Couldn't publish blog post"))) return new HttpUnauthorizedResult(); _blogPostService.Publish(post); @@ -246,7 +246,7 @@ namespace Orchard.Blogs.Controllers { if (post == null) return HttpNotFound(); - if (!Services.Authorizer.Authorize(Permissions.PublishOthersBlogPost, post, T("Couldn't unpublish blog post"))) + if (!Services.Authorizer.Authorize(Permissions.PublishBlogPost, post, T("Couldn't unpublish blog post"))) return new HttpUnauthorizedResult(); _blogPostService.Unpublish(post); diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Permissions.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Permissions.cs index 3c4b790d8..e4a346ce8 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Permissions.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Permissions.cs @@ -6,14 +6,14 @@ namespace Orchard.Blogs { public class Permissions : IPermissionProvider { public static readonly Permission ManageBlogs = new Permission { Description = "Manage blogs", Name = "ManageBlogs" }; - public static readonly Permission PublishOthersBlogPost = new Permission { Description = "Publish or unpublish blog post for others", Name = "PublishOthersBlogPost", ImpliedBy = new[] { ManageBlogs } }; - public static readonly Permission PublishOwnBlogPost = new Permission { Description = "Publish or unpublish own blog post", Name = "PublishOwnBlogPost", ImpliedBy = new[] { PublishOthersBlogPost } }; - public static readonly Permission EditOthersBlogPost = new Permission { Description = "Edit any blog posts", Name = "EditOthersBlogPost", ImpliedBy = new[] { PublishOthersBlogPost } }; - public static readonly Permission EditOwnBlogPost = new Permission { Description = "Edit own blog posts", Name = "EditOwnBlogPost", ImpliedBy = new[] { EditOthersBlogPost, PublishOwnBlogPost } }; - public static readonly Permission DeleteOthersBlogPost = new Permission { Description = "Delete blog post for others", Name = "DeleteOthersBlogPost", ImpliedBy = new[] { ManageBlogs } }; - public static readonly Permission DeleteOwnBlogPost = new Permission { Description = "Delete own blog post", Name = "DeleteOwnBlogPost", ImpliedBy = new[] { DeleteOthersBlogPost } }; + public static readonly Permission PublishBlogPost = new Permission { Description = "Publish or unpublish blog post for others", Name = "PublishBlogPost", ImpliedBy = new[] { ManageBlogs } }; + public static readonly Permission PublishOwnBlogPost = new Permission { Description = "Publish or unpublish own blog post", Name = "PublishOwnBlogPost", ImpliedBy = new[] { PublishBlogPost } }; + public static readonly Permission EditBlogPost = new Permission { Description = "Edit any blog posts", Name = "EditBlogPost", ImpliedBy = new[] { PublishBlogPost } }; + public static readonly Permission EditOwnBlogPost = new Permission { Description = "Edit own blog posts", Name = "EditOwnBlogPost", ImpliedBy = new[] { EditBlogPost, PublishOwnBlogPost } }; + public static readonly Permission DeleteBlogPost = new Permission { Description = "Delete blog post for others", Name = "DeleteBlogPost", ImpliedBy = new[] { ManageBlogs } }; + public static readonly Permission DeleteOwnBlogPost = new Permission { Description = "Delete own blog post", Name = "DeleteOwnBlogPost", ImpliedBy = new[] { DeleteBlogPost } }; - public static readonly Permission MetaListOthersBlogs = new Permission { ImpliedBy = new[] { EditOthersBlogPost, PublishOthersBlogPost, DeleteOthersBlogPost } }; + public static readonly Permission MetaListOthersBlogs = new Permission { ImpliedBy = new[] { EditBlogPost, PublishBlogPost, DeleteBlogPost } }; public static readonly Permission MetaListOwnBlogs = new Permission { ImpliedBy = new[] { EditOwnBlogPost, PublishOwnBlogPost, DeleteOwnBlogPost } }; public virtual Feature Feature { get; set; } @@ -22,11 +22,11 @@ namespace Orchard.Blogs { return new[] { ManageBlogs, EditOwnBlogPost, - EditOthersBlogPost, + EditBlogPost, PublishOwnBlogPost, - PublishOthersBlogPost, + PublishBlogPost, DeleteOwnBlogPost, - DeleteOthersBlogPost, + DeleteBlogPost, }; } @@ -38,7 +38,7 @@ namespace Orchard.Blogs { }, new PermissionStereotype { Name = "Editor", - Permissions = new[] {PublishOthersBlogPost,EditOthersBlogPost,DeleteOthersBlogPost} + Permissions = new[] {PublishBlogPost,EditBlogPost,DeleteBlogPost} }, new PermissionStereotype { Name = "Moderator", diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Security/BlogAuthorizationEventHandler.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Security/BlogAuthorizationEventHandler.cs index fb0585f71..a815a90a1 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Security/BlogAuthorizationEventHandler.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Security/BlogAuthorizationEventHandler.cs @@ -37,11 +37,11 @@ namespace Orchard.Blogs.Security { } private static Permission GetOwnerVariation(Permission permission) { - if (permission.Name == Permissions.PublishOthersBlogPost.Name) + if (permission.Name == Permissions.PublishBlogPost.Name) return Permissions.PublishOwnBlogPost; - if (permission.Name == Permissions.EditOthersBlogPost.Name) + if (permission.Name == Permissions.EditBlogPost.Name) return Permissions.EditOwnBlogPost; - if (permission.Name == Permissions.DeleteOthersBlogPost.Name) + if (permission.Name == Permissions.DeleteBlogPost.Name) return Permissions.DeleteOwnBlogPost; return null; } diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Services/XmlRpcHandler.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Services/XmlRpcHandler.cs index bf06b98ac..4ab345b21 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Services/XmlRpcHandler.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Services/XmlRpcHandler.cs @@ -239,7 +239,7 @@ namespace Orchard.Blogs.Services { if (blogPost == null) throw new ArgumentException(); - _authorizationService.CheckAccess(Permissions.EditOthersBlogPost, user, blogPost); + _authorizationService.CheckAccess(Permissions.EditBlogPost, user, blogPost); var postStruct = CreateBlogStruct(blogPost, urlHelper); @@ -255,7 +255,7 @@ namespace Orchard.Blogs.Services { if (blogPost == null) throw new ArgumentException(); - _authorizationService.CheckAccess(publish ? Permissions.PublishOthersBlogPost : Permissions.EditOthersBlogPost, user, blogPost); + _authorizationService.CheckAccess(publish ? Permissions.PublishBlogPost : Permissions.EditBlogPost, user, blogPost); var title = content.Optional("title"); var description = content.Optional("description"); @@ -290,7 +290,7 @@ namespace Orchard.Blogs.Services { if (blogPost == null) throw new ArgumentException(); - _authorizationService.CheckAccess(Permissions.DeleteOthersBlogPost, user, blogPost); + _authorizationService.CheckAccess(Permissions.DeleteBlogPost, user, blogPost); foreach (var driver in drivers) driver.Process(blogPost.Id);