lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-09-23 21:13:35 +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 });
}