lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-09-19 01:57:55 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Refactoring permissions class names

Browse Source 
--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4040296
This commit is contained in:
loudej
2009-11-14 02:45:22 +00:00
parent 07c57bc78d
commit a49384ca0f
5 changed files with 65 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/Orchard.Web/Packages/Orchard.CmsPages/Controllers/AdminController.cs
View File

@@ -97,10 +97,10 @@ namespace Orchard.CmsPages.Controllers {
case PageIndexBulkAction.PublishNow:
//TODO: Transaction
if (!_authorizationService.CheckAccess(CurrentUser, Permissions.PublishPagesPermission)) {
if (!_authorizationService.CheckAccess(CurrentUser, Permissions.PublishPages)) {
_notifier.Error(T("Couldn't publish page, user {0} doesn't have {1}",
(CurrentUser != null ? CurrentUser.UserName : String.Empty),
Permissions.PublishPagesPermission.Name));
Permissions.PublishPages.Name));
//return new HttpUnauthorizedResult();
break;
}
@@ -113,10 +113,10 @@ namespace Orchard.CmsPages.Controllers {
break;
case PageIndexBulkAction.PublishLater:
if (!_authorizationService.CheckAccess(CurrentUser, Permissions.SchedulePagesPermission)) {
if (!_authorizationService.CheckAccess(CurrentUser, Permissions.SchedulePages)) {
_notifier.Error("Couldn't publish page, user " +
(CurrentUser != null ? CurrentUser.UserName : String.Empty) + " doesn't have " +
Permissions.SchedulePagesPermission.Name);
Permissions.SchedulePages.Name);
//return new HttpUnauthorizedResult();
break;
}
@@ -135,10 +135,10 @@ namespace Orchard.CmsPages.Controllers {
break;
case PageIndexBulkAction.Unpublish:
if (!_authorizationService.CheckAccess(CurrentUser, Permissions.UnpublishPagesPermission)) {
if (!_authorizationService.CheckAccess(CurrentUser, Permissions.UnpublishPages)) {
_notifier.Error("Couldn't unpublish page, user " +
(CurrentUser != null ? CurrentUser.UserName : String.Empty) + " doesn't have " +
Permissions.UnpublishPagesPermission.Name);
Permissions.UnpublishPages.Name);
//return new HttpUnauthorizedResult();
break;
}
@@ -149,10 +149,10 @@ namespace Orchard.CmsPages.Controllers {
break;
case PageIndexBulkAction.Delete:
if (!_authorizationService.CheckAccess(CurrentUser, Permissions.DeletePagesPermission)) {
if (!_authorizationService.CheckAccess(CurrentUser, Permissions.DeletePages)) {
_notifier.Error("Couldn't delete page, user " +
(CurrentUser != null ? CurrentUser.UserName : String.Empty) + " doesn't have " +
Permissions.DeletePagesPermission.Name);
Permissions.DeletePages.Name);
//return new HttpUnauthorizedResult();
break;
}
@@ -214,10 +214,10 @@ namespace Orchard.CmsPages.Controllers {
var viewModel = new PageCreateViewModel { Templates = _templateProvider.List() };
try {
UpdateModel(viewModel, input.ToValueProvider());
if (!_authorizationService.CheckAccess(CurrentUser, Permissions.CreatePagesPermission)) {
if (!_authorizationService.CheckAccess(CurrentUser, Permissions.CreatePages)) {
_notifier.Error(T("Couldn't create page, user {0} doesn't have {1}",
(CurrentUser != null ? CurrentUser.UserName : String.Empty),
Permissions.CreatePagesPermission.Name));
Permissions.CreatePages.Name));
//return new HttpUnauthorizedResult();
return View(viewModel);
}
@@ -270,29 +270,29 @@ namespace Orchard.CmsPages.Controllers {
RemoveUnusedContentItems(model.Revision, model.Template);
_pageScheduler.ClearTasks(model.Revision.Page);
if (!_authorizationService.CheckAccess(CurrentUser, Permissions.ModifyPagesPermission)) {
if (!_authorizationService.CheckAccess(CurrentUser, Permissions.ModifyPages)) {
_notifier.Error("Couldn't edit page, user " +
(CurrentUser != null ? CurrentUser.UserName : String.Empty) + " doesn't have " +
Permissions.ModifyPagesPermission.Name);
Permissions.ModifyPages.Name);
//return new HttpUnauthorizedResult();
return RedirectToAction("Index");
}
switch (model.Command) {
case PageEditCommand.PublishNow:
if (!_authorizationService.CheckAccess(CurrentUser, Permissions.PublishPagesPermission)) {
if (!_authorizationService.CheckAccess(CurrentUser, Permissions.PublishPages)) {
_notifier.Error("Couldn't publish page, user " +
(CurrentUser != null ? CurrentUser.UserName : String.Empty) + " doesn't have " +
Permissions.PublishPagesPermission.Name);
Permissions.PublishPages.Name);
//return new HttpUnauthorizedResult();
break;
}
_pageManager.Publish(model.Revision, new PublishOptions());
break;
case PageEditCommand.PublishLater:
if (!_authorizationService.CheckAccess(CurrentUser, Permissions.SchedulePagesPermission)) {
if (!_authorizationService.CheckAccess(CurrentUser, Permissions.SchedulePages)) {
_notifier.Error("Couldn't publish page, user " +
(CurrentUser != null ? CurrentUser.UserName : String.Empty) + " doesn't have " +
Permissions.SchedulePagesPermission.Name);
Permissions.SchedulePages.Name);
//return new HttpUnauthorizedResult();
break;
}
@@ -321,10 +321,10 @@ namespace Orchard.CmsPages.Controllers {
[FormValueRequired("submit.DeleteDraft")]
public ActionResult DeleteDraft(int id) {
#warning UNIT TEST!!!!
if (!_authorizationService.CheckAccess(CurrentUser, Permissions.DeleteDraftPagesPermission)) {
if (!_authorizationService.CheckAccess(CurrentUser, Permissions.DeleteDraftPages)) {
_notifier.Error("Couldn't delete draft page, user " +
(CurrentUser != null ? CurrentUser.UserName : String.Empty) + " doesn't have " +
Permissions.DeleteDraftPagesPermission.Name);
Permissions.DeleteDraftPages.Name);
//return new HttpUnauthorizedResult();
return RedirectToAction("Edit", new { id });
}

2
src/Orchard.Web/Packages/Orchard.CmsPages/Orchard.CmsPages.csproj
View File

@@ -73,7 +73,7 @@
</ItemGroup>
<ItemGroup>
<Compile Include="AdminMenu.cs" />
<Compile Include="CmsPagesPermissions.cs" />
<Compile Include="Permissions.cs" />
<Compile Include="Controllers\AdminController.cs" />
<Compile Include="Controllers\TemplatesController.cs" />
<Compile Include="Models\ContentItem.cs" />

36
src/Orchard.Web/Packages/Orchard.CmsPages/Permissions.cs
View File

@@ -3,15 +3,15 @@ using Orchard.Security.Permissions;
namespace Orchard.CmsPages {
public class Permissions : IPermissionProvider {
public static readonly Permission ViewPagesPermission = new Permission { Description = "Viewing CMS Pages", Name = "ViewPagesPermission" };
public static readonly Permission CreatePagesPermission = new Permission { Description = "Creating CMS Pages", Name = "CreatePagesPermission" };
public static readonly Permission CreateDraftPagesPermission = new Permission { Description = "Creating CMS Page Drafts", Name = "CreateDraftPagesPermission" };
public static readonly Permission DeleteDraftPagesPermission = new Permission { Description = "Deleting CMS Page Drafts", Name = "DeleteDraftPagesPermission" };
public static readonly Permission ModifyPagesPermission = new Permission { Description = "Modifying CMS Pages", Name = "ModifyPagesPermission" };
public static readonly Permission DeletePagesPermission = new Permission { Description = "Deleting CMS Pages", Name = "DeletePagesPermission" };
public static readonly Permission PublishPagesPermission = new Permission { Description = "Publishing CMS Pages", Name = "PublishPagesPermission" };
public static readonly Permission UnpublishPagesPermission = new Permission { Description = "Unpublishing CMS Pages", Name = "UnpublishPagesPermission" };
public static readonly Permission SchedulePagesPermission = new Permission { Description = "Scheduling CMS Pages", Name = "SchedulePagesPermission" };
public static readonly Permission ViewPages = new Permission { Description = "Viewing CMS Pages", Name = "ViewPages" };
public static readonly Permission CreatePages = new Permission { Description = "Creating CMS Pages", Name = "CreatePages" };
public static readonly Permission CreateDraftPages = new Permission { Description = "Creating CMS Page Drafts", Name = "CreateDraftPages" };
public static readonly Permission DeleteDraftPages = new Permission { Description = "Deleting CMS Page Drafts", Name = "DeleteDraftPages" };
public static readonly Permission ModifyPages = new Permission { Description = "Modifying CMS Pages", Name = "ModifyPages" };
public static readonly Permission DeletePages = new Permission { Description = "Deleting CMS Pages", Name = "DeletePages" };
public static readonly Permission PublishPages = new Permission { Description = "Publishing CMS Pages", Name = "PublishPages" };
public static readonly Permission UnpublishPages = new Permission { Description = "Unpublishing CMS Pages", Name = "UnpublishPages" };
public static readonly Permission SchedulePages = new Permission { Description = "Scheduling CMS Pages", Name = "SchedulePages" };
public string PackageName {
get {
@@ -21,15 +21,15 @@ namespace Orchard.CmsPages {
public IEnumerable<Permission> GetPermissions() {
return new List<Permission> {
ViewPagesPermission,
CreatePagesPermission,
CreateDraftPagesPermission,
DeleteDraftPagesPermission,
ModifyPagesPermission,
DeletePagesPermission,
PublishPagesPermission,
UnpublishPagesPermission,
SchedulePagesPermission
ViewPages,
CreatePages,
CreateDraftPages,
DeleteDraftPages,
ModifyPages,
DeletePages,
PublishPages,
UnpublishPages,
SchedulePages
};
}
}

32
src/Orchard.Web/Packages/Orchard.Media/Controllers/AdminController.cs
View File

@@ -58,10 +58,10 @@ namespace Orchard.Media.Controllers {
var viewModel = new MediaFolderCreateViewModel();
try {
UpdateModel(viewModel, input.ToValueProvider());
if (!_authorizationService.CheckAccess(CurrentUser, Permissions.CreateMediaFolderPermission)) {
if (!_authorizationService.CheckAccess(CurrentUser, Permissions.CreateMediaFolder)) {
_notifier.Error("Couldn't create media folder, user " +
(CurrentUser != null ? CurrentUser.UserName : String.Empty) + " doesn't have " +
Permissions.CreateMediaFolderPermission.Name);
Permissions.CreateMediaFolder.Name);
//return new HttpUnauthorizedResult();
return View(viewModel);
}
@@ -88,10 +88,10 @@ namespace Orchard.Media.Controllers {
if (key.StartsWith("Checkbox.File.") && input[key] == "true") {
string fileName = key.Substring("Checkbox.File.".Length);
string folderName = input[fileName];
if (!_authorizationService.CheckAccess(CurrentUser, Permissions.DeleteMediaPermission)) {
if (!_authorizationService.CheckAccess(CurrentUser, Permissions.DeleteMedia)) {
_notifier.Error("Couldn't delete media file, user " +
(CurrentUser != null ? CurrentUser.UserName : String.Empty) + " doesn't have " +
Permissions.DeleteMediaPermission.Name);
Permissions.DeleteMedia.Name);
//return new HttpUnauthorizedResult();
return RedirectToAction("Index");
}
@@ -100,10 +100,10 @@ namespace Orchard.Media.Controllers {
else if (key.StartsWith("Checkbox.Folder.") && input[key] == "true") {
string folderName = key.Substring("Checkbox.Folder.".Length);
string folderPath = input[folderName];
if (!_authorizationService.CheckAccess(CurrentUser, Permissions.DeleteMediaFolderPermission)) {
if (!_authorizationService.CheckAccess(CurrentUser, Permissions.DeleteMediaFolder)) {
_notifier.Error("Couldn't delete media folder, user " +
(CurrentUser != null ? CurrentUser.UserName : String.Empty) + " doesn't have " +
Permissions.DeleteMediaFolderPermission.Name);
Permissions.DeleteMediaFolder.Name);
//return new HttpUnauthorizedResult();
return RedirectToAction("Index");
}
@@ -131,10 +131,10 @@ namespace Orchard.Media.Controllers {
//TODO: There may be better ways to do this.
// Delete
if (!String.IsNullOrEmpty(HttpContext.Request.Form["submit.Delete"])) {
if (!_authorizationService.CheckAccess(CurrentUser, Permissions.DeleteMediaFolderPermission)) {
if (!_authorizationService.CheckAccess(CurrentUser, Permissions.DeleteMediaFolder)) {
_notifier.Error("Couldn't delete media folder, user " +
(CurrentUser != null ? CurrentUser.UserName : String.Empty) + " doesn't have " +
Permissions.DeleteMediaFolderPermission.Name);
Permissions.DeleteMediaFolder.Name);
//return new HttpUnauthorizedResult();
return View(viewModel);
}
@@ -142,10 +142,10 @@ namespace Orchard.Media.Controllers {
}
// Save
else {
if (!_authorizationService.CheckAccess(CurrentUser, Permissions.RenameMediaFolderPermission)) {
if (!_authorizationService.CheckAccess(CurrentUser, Permissions.RenameMediaFolder)) {
_notifier.Error("Couldn't rename media folder, user " +
(CurrentUser != null ? CurrentUser.UserName : String.Empty) + " doesn't have " +
Permissions.RenameMediaFolderPermission.Name);
Permissions.RenameMediaFolder.Name);
//return new HttpUnauthorizedResult();
return View(viewModel);
}
@@ -171,10 +171,10 @@ namespace Orchard.Media.Controllers {
try {
UpdateModel(viewModel, input.ToValueProvider());
if (!_authorizationService.CheckAccess(CurrentUser, Permissions.UploadMediaPermission)) {
if (!_authorizationService.CheckAccess(CurrentUser, Permissions.UploadMedia)) {
_notifier.Error("Couldn't upload media file, user " +
(CurrentUser != null ? CurrentUser.UserName : String.Empty) + " doesn't have " +
Permissions.UploadMediaPermission.Name);
Permissions.UploadMedia.Name);
//return new HttpUnauthorizedResult();
return View(viewModel);
}
@@ -208,20 +208,20 @@ namespace Orchard.Media.Controllers {
var viewModel = new MediaItemEditViewModel();
try {
UpdateModel(viewModel, input.ToValueProvider());
if (!_authorizationService.CheckAccess(CurrentUser, Permissions.ModifyMediaPermission)) {
if (!_authorizationService.CheckAccess(CurrentUser, Permissions.ModifyMedia)) {
_notifier.Error("Couldn't modify media file, user " +
(CurrentUser != null ? CurrentUser.UserName : String.Empty) + " doesn't have " +
Permissions.ModifyMediaPermission.Name);
Permissions.ModifyMedia.Name);
//return new HttpUnauthorizedResult();
return View(viewModel);
}
//TODO: There may be better ways to do this.
// Delete
if (!String.IsNullOrEmpty(HttpContext.Request.Form["submit.Delete"])) {
if (!_authorizationService.CheckAccess(CurrentUser, Permissions.DeleteMediaPermission)) {
if (!_authorizationService.CheckAccess(CurrentUser, Permissions.DeleteMedia)) {
_notifier.Error("Couldn't delete media file, user " +
(CurrentUser != null ? CurrentUser.UserName : String.Empty) + " doesn't have " +
Permissions.DeleteMediaPermission.Name);
Permissions.DeleteMedia.Name);
//return new HttpUnauthorizedResult();
return View(viewModel);
}

24
src/Orchard.Web/Packages/Orchard.Media/Permissions.cs
View File

@@ -3,12 +3,12 @@ using Orchard.Security.Permissions;
namespace Orchard.Media {
public class Permissions : IPermissionProvider {
public static readonly Permission UploadMediaPermission = new Permission { Description = "Uploading Media Files", Name = "UploadMediaPermission" };
public static readonly Permission ModifyMediaPermission = new Permission { Description = "Modifying Media Files", Name = "ModifyMediaPermission" };
public static readonly Permission DeleteMediaPermission = new Permission { Description = "Deleting Media Files", Name = "DeleteMediaPermission" };
public static readonly Permission CreateMediaFolderPermission = new Permission { Description = "Creating Media Folders", Name = "CreateMediaFolderPermission" };
public static readonly Permission DeleteMediaFolderPermission = new Permission { Description = "Deleting Media Folders", Name = "DeleteMediaFolderPermission" };
public static readonly Permission RenameMediaFolderPermission = new Permission { Description = "Renaming Media Folders", Name = "RenameMediaFolderPermission" };
public static readonly Permission UploadMedia = new Permission { Description = "Uploading Media Files", Name = "UploadMedia" };
public static readonly Permission ModifyMedia = new Permission { Description = "Modifying Media Files", Name = "ModifyMedia" };
public static readonly Permission DeleteMedia = new Permission { Description = "Deleting Media Files", Name = "DeleteMedia" };
public static readonly Permission CreateMediaFolder = new Permission { Description = "Creating Media Folders", Name = "CreateMediaFolder" };
public static readonly Permission DeleteMediaFolder = new Permission { Description = "Deleting Media Folders", Name = "DeleteMediaFolder" };
public static readonly Permission RenameMediaFolder = new Permission { Description = "Renaming Media Folders", Name = "RenameMediaFolder" };
public string PackageName {
get {
@@ -18,12 +18,12 @@ namespace Orchard.Media {
public IEnumerable<Permission> GetPermissions() {
return new List<Permission> {
UploadMediaPermission,
ModifyMediaPermission,
DeleteMediaPermission,
CreateMediaFolderPermission,
DeleteMediaFolderPermission,
RenameMediaFolderPermission
UploadMedia,
ModifyMedia,
DeleteMedia,
CreateMediaFolder,
DeleteMediaFolder,
RenameMediaFolder
};
}
}