From 14df2a4fb74e5be11f848da352257ea8083ccc88 Mon Sep 17 00:00:00 2001
From: Suha Can <suhacan@microsoft.com>
Date: Wed, 8 Dec 2010 12:42:00 -0800
Subject: [PATCH] 16971: Merge comment permissions

--HG--
branch : dev
---
 .../Orchard.Comments/Controllers/AdminController.cs       | 4 ++--
 src/Orchard.Web/Modules/Orchard.Comments/Permissions.cs   | 8 --------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Comments/Controllers/AdminController.cs
index d77a7362f..c5164d4ad 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Controllers/AdminController.cs
@@ -231,7 +231,7 @@ namespace Orchard.Comments.Controllers {
         [HttpPost]
         public ActionResult Close(int commentedItemId, string returnUrl) {
             try {
-                if (!Services.Authorizer.Authorize(Permissions.CloseComment, T("Couldn't close comments")))
+                if (!Services.Authorizer.Authorize(Permissions.ManageComments, T("Couldn't close comments")))
                     return new HttpUnauthorizedResult();
                 _commentService.CloseCommentsForCommentedContent(commentedItemId);
                 if (!String.IsNullOrEmpty(returnUrl)) {
@@ -251,7 +251,7 @@ namespace Orchard.Comments.Controllers {
         [HttpPost]
         public ActionResult Enable(int commentedItemId, string returnUrl) {
             try {
-                if (!Services.Authorizer.Authorize(Permissions.EnableComment, T("Couldn't enable comments")))
+                if (!Services.Authorizer.Authorize(Permissions.ManageComments, T("Couldn't enable comments")))
                     return new HttpUnauthorizedResult();
                 _commentService.EnableCommentsForCommentedContent(commentedItemId);
                 if (!String.IsNullOrEmpty(returnUrl)) {
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Permissions.cs b/src/Orchard.Web/Modules/Orchard.Comments/Permissions.cs
index a5e49a36e..67500ac71 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Permissions.cs
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Permissions.cs
@@ -5,22 +5,14 @@ using Orchard.Security.Permissions;
 namespace Orchard.Comments {
     public class Permissions : IPermissionProvider {
         public static readonly Permission AddComment = new Permission { Description = "Add comment", Name = "AddComment" };
-        public static readonly Permission EnableComment = new Permission { Description = "Enabling Comments on content items", Name = "EnableComment" };//refactoring
-        public static readonly Permission CloseComment = new Permission { Description = "Closing Comments", Name = "CloseComment" };//refactoring
-        public static readonly Permission CloseCommentOnOwnItems = new Permission { Description = "Closing Comments on own items", Name = "CloseCommentOnOwnItems" };//refactoring
         public static readonly Permission ManageComments = new Permission { Description = "Manage comments", Name = "ManageComments" };
-        public static readonly Permission ManageOthersComments = new Permission { Description = "Manage comments for others", Name = "ManageOthersComments" };
 
         public virtual Feature Feature { get; set; }
 
         public IEnumerable<Permission> GetPermissions() {
             return new[] {
                 AddComment,
-                EnableComment,
-                CloseComment,
-                CloseCommentOnOwnItems,
                 ManageComments,
-                ManageOthersComments
             };
         }