lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-04-30 03:00:34 +08:00
Code Issues Actions2 Packages Projects Releases Wiki Activity

Adjusting permission names which weren't clear from the spec

Browse Source 
--HG--
branch : 1.x
This commit is contained in:
Louis DeJardin 2010-12-15 21:54:25 -08:00
parent a2e5f82196
commit 6358ad20ff
13 changed files with 54 additions and 46 deletions

6
src/Orchard.Specs/Bindings/ContentRights.cs
View File

@ -59,11 +59,11 @@ namespace Orchard.Specs.Bindings {
private static Permission GetPermissionForAction(string action) { private static Permission GetPermissionForAction(string action) {
switch ( action ) { switch ( action ) {
case "publish": case "publish":
return Permissions.PublishOthersContent; return Permissions.PublishContent;
case "edit": case "edit":
return Permissions.EditOthersContent; return Permissions.EditContent;
case "delete": case "delete":
return Permissions.DeleteOthersContent; return Permissions.DeleteContent;
default: default:
return null; return null;
} }

6
src/Orchard.Specs/ContentRights.feature
View File

@ -11,7 +11,7 @@ Scenario: Administrators can manage a Page
Scenario: Users can't create a Page if they don't have the PublishContent permission Scenario: Users can't create a Page if they don't have the PublishContent permission
Given I have installed Orchard Given I have installed Orchard
When I have a role "CustomRole" with permissions "EditOthersContent, DeleteOthersContent" When I have a role "CustomRole" with permissions "EditContent, DeleteContent"
And I have a user "user1" with roles "CustomRole" And I have a user "user1" with roles "CustomRole"
Then "user1" should not be able to "publish" a "Page" owned by "user1" Then "user1" should not be able to "publish" a "Page" owned by "user1"
And "user1" should be able to "edit" a "Page" owned by "user1" And "user1" should be able to "edit" a "Page" owned by "user1"
@ -19,7 +19,7 @@ Scenario: Users can't create a Page if they don't have the PublishContent permis
Scenario: Users can create a Page of others if they have PublishContent permission Scenario: Users can create a Page of others if they have PublishContent permission
Given I have installed Orchard Given I have installed Orchard
When I have a role "CustomRole" with permissions "PublishOthersContent" When I have a role "CustomRole" with permissions "PublishContent"
And I have a user "user1" with roles "CustomRole" And I have a user "user1" with roles "CustomRole"
And I have a user "user2" with roles "Administrator" And I have a user "user2" with roles "Administrator"
Then "user1" should be able to "publish" a "Page" owned by "user2" Then "user1" should be able to "publish" a "Page" owned by "user2"
@ -44,7 +44,7 @@ Scenario: Users can create and edit a Page even if they only have the PublishOwn
Scenario: Users can't edit a Page if they don't have the EditContent permission Scenario: Users can't edit a Page if they don't have the EditContent permission
Given I have installed Orchard Given I have installed Orchard
When I have a role "CustomRole" with permissions "DeleteOthersContent" When I have a role "CustomRole" with permissions "DeleteContent"
And I have a user "user1" with roles "CustomRole" And I have a user "user1" with roles "CustomRole"
Then "user1" should not be able to "publish" a "Page" owned by "user1" Then "user1" should not be able to "publish" a "Page" owned by "user1"
And "user1" should not be able to "edit" a "Page" owned by "user1" And "user1" should not be able to "edit" a "Page" owned by "user1"

6
src/Orchard.Specs/ContentRights.feature.cs generated
View File

@ -82,7 +82,7 @@ this.ScenarioSetup(scenarioInfo);
#line 13 #line 13
testRunner.Given("I have installed Orchard"); testRunner.Given("I have installed Orchard");
#line 14 #line 14
testRunner.When("I have a role \"CustomRole\" with permissions \"EditOthersContent, DeleteOthersConte" + testRunner.When("I have a role \"CustomRole\" with permissions \"EditContent, DeleteConte" +
"nt\""); "nt\"");
#line 15 #line 15
testRunner.And("I have a user \"user1\" with roles \"CustomRole\""); testRunner.And("I have a user \"user1\" with roles \"CustomRole\"");
@ -106,7 +106,7 @@ this.ScenarioSetup(scenarioInfo);
#line 21 #line 21
testRunner.Given("I have installed Orchard"); testRunner.Given("I have installed Orchard");
#line 22 #line 22
testRunner.When("I have a role \"CustomRole\" with permissions \"PublishOthersContent\""); testRunner.When("I have a role \"CustomRole\" with permissions \"PublishContent\"");
#line 23 #line 23
testRunner.And("I have a user \"user1\" with roles \"CustomRole\""); testRunner.And("I have a user \"user1\" with roles \"CustomRole\"");
#line 24 #line 24
@ -179,7 +179,7 @@ this.ScenarioSetup(scenarioInfo);
#line 46 #line 46
testRunner.Given("I have installed Orchard"); testRunner.Given("I have installed Orchard");
#line 47 #line 47
testRunner.When("I have a role \"CustomRole\" with permissions \"DeleteOthersContent\""); testRunner.When("I have a role \"CustomRole\" with permissions \"DeleteContent\"");
#line 48 #line 48
testRunner.And("I have a user \"user1\" with roles \"CustomRole\""); testRunner.And("I have a user \"user1\" with roles \"CustomRole\"");
#line 49 #line 49

22
src/Orchard.Web/Core/Contents/Controllers/AdminController.cs
View File

@ -138,7 +138,7 @@ namespace Orchard.Core.Contents.Controllers {
break; break;
case ContentsBulkAction.PublishNow: case ContentsBulkAction.PublishNow:
foreach (var item in itemIds.Select(itemId => _contentManager.GetLatest(itemId))) { foreach (var item in itemIds.Select(itemId => _contentManager.GetLatest(itemId))) {
if (!accessChecked && !Services.Authorizer.Authorize(Permissions.PublishOthersContent, item, T("Couldn't publish selected content."))) if (!accessChecked && !Services.Authorizer.Authorize(Permissions.PublishContent, item, T("Couldn't publish selected content.")))
return new HttpUnauthorizedResult(); return new HttpUnauthorizedResult();
accessChecked = true; accessChecked = true;
@ -149,7 +149,7 @@ namespace Orchard.Core.Contents.Controllers {
break; break;
case ContentsBulkAction.Unpublish: case ContentsBulkAction.Unpublish:
foreach (var item in itemIds.Select(itemId => _contentManager.GetLatest(itemId))) { foreach (var item in itemIds.Select(itemId => _contentManager.GetLatest(itemId))) {
if (!accessChecked && !Services.Authorizer.Authorize(Permissions.PublishOthersContent, item, T("Couldn't unpublish selected content."))) if (!accessChecked && !Services.Authorizer.Authorize(Permissions.PublishContent, item, T("Couldn't unpublish selected content.")))
return new HttpUnauthorizedResult(); return new HttpUnauthorizedResult();
accessChecked = true; accessChecked = true;
@ -160,7 +160,7 @@ namespace Orchard.Core.Contents.Controllers {
break; break;
case ContentsBulkAction.Remove: case ContentsBulkAction.Remove:
foreach (var item in itemIds.Select(itemId => _contentManager.GetLatest(itemId))) { foreach (var item in itemIds.Select(itemId => _contentManager.GetLatest(itemId))) {
if (!accessChecked && !Services.Authorizer.Authorize(Permissions.DeleteOthersContent, item, T("Couldn't remove selected content."))) if (!accessChecked && !Services.Authorizer.Authorize(Permissions.DeleteContent, item, T("Couldn't remove selected content.")))
return new HttpUnauthorizedResult(); return new HttpUnauthorizedResult();
accessChecked = true; accessChecked = true;
@ -190,7 +190,7 @@ namespace Orchard.Core.Contents.Controllers {
var contentItem = _contentManager.New(id); var contentItem = _contentManager.New(id);
if (!Services.Authorizer.Authorize(Permissions.PublishOthersContent, contentItem, T("Cannot create content"))) if (!Services.Authorizer.Authorize(Permissions.PublishContent, contentItem, T("Cannot create content")))
return new HttpUnauthorizedResult(); return new HttpUnauthorizedResult();
dynamic model = _contentManager.BuildEditor(contentItem); dynamic model = _contentManager.BuildEditor(contentItem);
@ -219,7 +219,7 @@ namespace Orchard.Core.Contents.Controllers {
private ActionResult CreatePOST(string id, Action<ContentItem> conditionallyPublish) { private ActionResult CreatePOST(string id, Action<ContentItem> conditionallyPublish) {
var contentItem = _contentManager.New(id); var contentItem = _contentManager.New(id);
if (!Services.Authorizer.Authorize(Permissions.PublishOthersContent, contentItem, T("Couldn't create content"))) if (!Services.Authorizer.Authorize(Permissions.PublishContent, contentItem, T("Couldn't create content")))
return new HttpUnauthorizedResult(); return new HttpUnauthorizedResult();
_contentManager.Create(contentItem, VersionOptions.Draft); _contentManager.Create(contentItem, VersionOptions.Draft);
@ -245,7 +245,7 @@ namespace Orchard.Core.Contents.Controllers {
if (contentItem == null) if (contentItem == null)
return HttpNotFound(); return HttpNotFound();
if (!Services.Authorizer.Authorize(Permissions.EditOthersContent, contentItem, T("Cannot edit content"))) if (!Services.Authorizer.Authorize(Permissions.EditContent, contentItem, T("Cannot edit content")))
return new HttpUnauthorizedResult(); return new HttpUnauthorizedResult();
dynamic model = _contentManager.BuildEditor(contentItem); dynamic model = _contentManager.BuildEditor(contentItem);
@ -270,7 +270,7 @@ namespace Orchard.Core.Contents.Controllers {
if (content == null) if (content == null)
return HttpNotFound(); return HttpNotFound();
if (!Services.Authorizer.Authorize(Permissions.PublishOthersContent, content, T("Couldn't publish content"))) if (!Services.Authorizer.Authorize(Permissions.PublishContent, content, T("Couldn't publish content")))
return new HttpUnauthorizedResult(); return new HttpUnauthorizedResult();
return EditPOST(id, returnUrl, contentItem => _contentManager.Publish(contentItem)); return EditPOST(id, returnUrl, contentItem => _contentManager.Publish(contentItem));
@ -282,7 +282,7 @@ namespace Orchard.Core.Contents.Controllers {
if (contentItem == null) if (contentItem == null)
return HttpNotFound(); return HttpNotFound();
if (!Services.Authorizer.Authorize(Permissions.EditOthersContent, contentItem, T("Couldn't edit content"))) if (!Services.Authorizer.Authorize(Permissions.EditContent, contentItem, T("Couldn't edit content")))
return new HttpUnauthorizedResult(); return new HttpUnauthorizedResult();
dynamic model = _contentManager.UpdateEditor(contentItem, this); dynamic model = _contentManager.UpdateEditor(contentItem, this);
@ -304,7 +304,7 @@ namespace Orchard.Core.Contents.Controllers {
public ActionResult Remove(int id, string returnUrl) { public ActionResult Remove(int id, string returnUrl) {
var contentItem = _contentManager.Get(id, VersionOptions.Latest); var contentItem = _contentManager.Get(id, VersionOptions.Latest);
if (!Services.Authorizer.Authorize(Permissions.DeleteOthersContent, contentItem, T("Couldn't remove content"))) if (!Services.Authorizer.Authorize(Permissions.DeleteContent, contentItem, T("Couldn't remove content")))
return new HttpUnauthorizedResult(); return new HttpUnauthorizedResult();
if (contentItem != null) { if (contentItem != null) {
@ -323,7 +323,7 @@ namespace Orchard.Core.Contents.Controllers {
if (contentItem == null) if (contentItem == null)
return HttpNotFound(); return HttpNotFound();
if (!Services.Authorizer.Authorize(Permissions.PublishOthersContent, contentItem, T("Couldn't publish content"))) if (!Services.Authorizer.Authorize(Permissions.PublishContent, contentItem, T("Couldn't publish content")))
return new HttpUnauthorizedResult(); return new HttpUnauthorizedResult();
_contentManager.Publish(contentItem); _contentManager.Publish(contentItem);
@ -339,7 +339,7 @@ namespace Orchard.Core.Contents.Controllers {
if (contentItem == null) if (contentItem == null)
return HttpNotFound(); return HttpNotFound();
if (!Services.Authorizer.Authorize(Permissions.PublishOthersContent, contentItem, T("Couldn't unpublish content"))) if (!Services.Authorizer.Authorize(Permissions.PublishContent, contentItem, T("Couldn't unpublish content")))
return new HttpUnauthorizedResult(); return new HttpUnauthorizedResult();
_contentManager.Unpublish(contentItem); _contentManager.Unpublish(contentItem);

2
src/Orchard.Web/Core/Contents/Controllers/ItemController.cs
View File

@ -37,7 +37,7 @@ namespace Orchard.Core.Contents.Controllers {
var contentItem = _contentManager.Get(id, versionOptions); var contentItem = _contentManager.Get(id, versionOptions);
if (!Services.Authorizer.Authorize(Permissions.EditOthersContent, contentItem, T("Cannot edit content"))) if (!Services.Authorizer.Authorize(Permissions.EditContent, contentItem, T("Cannot edit content")))
return new HttpUnauthorizedResult(); return new HttpUnauthorizedResult();
dynamic model = _contentManager.BuildDisplay(contentItem); dynamic model = _contentManager.BuildDisplay(contentItem);

12
src/Orchard.Web/Core/Contents/DynamicPermissions.cs
View File

@ -9,19 +9,19 @@ using Orchard.Security.Permissions;
namespace Orchard.Core.Contents { namespace Orchard.Core.Contents {
public class DynamicPermissions : IPermissionProvider { public class DynamicPermissions : IPermissionProvider {
private static readonly Permission PublishContent = new Permission { Description = "Publish or unpublish {0} for others", Name = "Publish_{0}", ImpliedBy = new[] { Permissions.PublishOthersContent } }; private static readonly Permission PublishContent = new Permission { Description = "Publish or unpublish {0} for others", Name = "Publish_{0}", ImpliedBy = new[] { Permissions.PublishContent } };
private static readonly Permission PublishOwnContent = new Permission { Description = "Publish or unpublish {0}", Name = "PublishOwn_{0}", ImpliedBy = new[] { PublishContent, Permissions.PublishOwnContent } }; private static readonly Permission PublishOwnContent = new Permission { Description = "Publish or unpublish {0}", Name = "PublishOwn_{0}", ImpliedBy = new[] { PublishContent, Permissions.PublishOwnContent } };
private static readonly Permission EditContent = new Permission { Description = "Edit {0} for others", Name = "Edit_{0}", ImpliedBy = new[] { PublishContent, Permissions.PublishOthersContent } }; private static readonly Permission EditContent = new Permission { Description = "Edit {0} for others", Name = "Edit_{0}", ImpliedBy = new[] { PublishContent, Permissions.PublishContent } };
private static readonly Permission EditOwnContent = new Permission { Description = "Edit {0}", Name = "EditOwn_{0}", ImpliedBy = new[] { EditContent, PublishOwnContent, Permissions.EditOwnContent } }; private static readonly Permission EditOwnContent = new Permission { Description = "Edit {0}", Name = "EditOwn_{0}", ImpliedBy = new[] { EditContent, PublishOwnContent, Permissions.EditOwnContent } };
private static readonly Permission DeleteContent = new Permission { Description = "Delete {0} for others", Name = "Delete_{0}", ImpliedBy = new[] { Permissions.DeleteOthersContent } }; private static readonly Permission DeleteContent = new Permission { Description = "Delete {0} for others", Name = "Delete_{0}", ImpliedBy = new[] { Permissions.DeleteContent } };
private static readonly Permission DeleteOwnContent = new Permission { Description = "Delete {0}", Name = "DeleteOwn_{0}", ImpliedBy = new[] { DeleteContent, Permissions.DeleteOwnContent } }; private static readonly Permission DeleteOwnContent = new Permission { Description = "Delete {0}", Name = "DeleteOwn_{0}", ImpliedBy = new[] { DeleteContent, Permissions.DeleteOwnContent } };
public static readonly Dictionary<string, Permission> PermissionTemplates = new Dictionary<string, Permission> { public static readonly Dictionary<string, Permission> PermissionTemplates = new Dictionary<string, Permission> {
{Permissions.PublishOthersContent.Name, PublishContent}, {Permissions.PublishContent.Name, PublishContent},
{Permissions.PublishOwnContent.Name, PublishOwnContent}, {Permissions.PublishOwnContent.Name, PublishOwnContent},
{Permissions.EditOthersContent.Name, EditContent}, {Permissions.EditContent.Name, EditContent},
{Permissions.EditOwnContent.Name, EditOwnContent}, {Permissions.EditOwnContent.Name, EditOwnContent},
{Permissions.DeleteOthersContent.Name, DeleteContent}, {Permissions.DeleteContent.Name, DeleteContent},
{Permissions.DeleteOwnContent.Name, DeleteOwnContent} {Permissions.DeleteOwnContent.Name, DeleteOwnContent}
}; };

30
src/Orchard.Web/Core/Contents/Permissions.cs
View File

@ -4,12 +4,20 @@ using Orchard.Security.Permissions;
namespace Orchard.Core.Contents { namespace Orchard.Core.Contents {
public class Permissions : IPermissionProvider { public class Permissions : IPermissionProvider {
public static readonly Permission PublishOthersContent = new Permission { Description = "Publish or unpublish content for others", Name = "PublishOthersContent" };
public static readonly Permission PublishOwnContent = new Permission { Description = "Publish or unpublish own content", Name = "PublishOwnContent", ImpliedBy = new[] { PublishOthersContent } }; // Note - in code you should demand PublishContent, EditContent, or DeleteContent
public static readonly Permission EditOthersContent = new Permission { Description = "Edit content for others", Name = "EditOthersContent", ImpliedBy = new[] { PublishOthersContent } }; // Do not demand the "Own" variation - those are applied automatically when you demand the main three
public static readonly Permission EditOwnContent = new Permission { Description = "Edit own content", Name = "EditOwnContent", ImpliedBy = new[] { EditOthersContent, PublishOwnContent } };
public static readonly Permission DeleteOthersContent = new Permission { Description = "Delete content for others", Name = "DeleteOthersContent" }; // Also - the internal name EditContent is used instead of EditOthersContent
public static readonly Permission DeleteOwnContent = new Permission { Description = "Delete own content", Name = "DeleteOwnContent", ImpliedBy = new[] { DeleteOthersContent } }; // because demanding "EditContent" is correct and looks right,
// but demanding "EditOthersContent" looks wrong so wasn't used when it should have been
public static readonly Permission PublishContent = new Permission { Description = "Publish or unpublish content for others", Name = "PublishContent" };
public static readonly Permission PublishOwnContent = new Permission { Description = "Publish or unpublish own content", Name = "PublishOwnContent", ImpliedBy = new[] { PublishContent } };
public static readonly Permission EditContent = new Permission { Description = "Edit content for others", Name = "EditContent", ImpliedBy = new[] { PublishContent } };
public static readonly Permission EditOwnContent = new Permission { Description = "Edit own content", Name = "EditOwnContent", ImpliedBy = new[] { EditContent, PublishOwnContent } };
public static readonly Permission DeleteContent = new Permission { Description = "Delete content for others", Name = "DeleteContent" };
public static readonly Permission DeleteOwnContent = new Permission { Description = "Delete own content", Name = "DeleteOwnContent", ImpliedBy = new[] { DeleteContent } };
public static readonly Permission MetaListContent = new Permission { ImpliedBy = new[] { EditOwnContent, PublishOwnContent, DeleteOwnContent } }; public static readonly Permission MetaListContent = new Permission { ImpliedBy = new[] { EditOwnContent, PublishOwnContent, DeleteOwnContent } };
@ -18,11 +26,11 @@ namespace Orchard.Core.Contents {
public IEnumerable<Permission> GetPermissions() { public IEnumerable<Permission> GetPermissions() {
return new [] { return new [] {
EditOwnContent, EditOwnContent,
EditOthersContent, EditContent,
PublishOwnContent, PublishOwnContent,
PublishOthersContent, PublishContent,
DeleteOwnContent, DeleteOwnContent,
DeleteOthersContent, DeleteContent,
}; };
} }
@ -30,11 +38,11 @@ namespace Orchard.Core.Contents {
return new[] { return new[] {
new PermissionStereotype { new PermissionStereotype {
Name = "Administrator", Name = "Administrator",
Permissions = new[] {PublishOthersContent,EditOthersContent,DeleteOthersContent} Permissions = new[] {PublishContent,EditContent,DeleteContent}
}, },
new PermissionStereotype { new PermissionStereotype {
Name = "Editor", Name = "Editor",
Permissions = new[] {PublishOthersContent,EditOthersContent,DeleteOthersContent} Permissions = new[] {PublishContent,EditContent,DeleteContent}
}, },
new PermissionStereotype { new PermissionStereotype {
Name = "Moderator", Name = "Moderator",

6
src/Orchard.Web/Core/Contents/Security/AuthorizationEventHandler.cs
View File

@ -54,11 +54,11 @@ namespace Orchard.Core.Contents.Security
} }
private static Permission GetOwnerVariation(Permission permission) { private static Permission GetOwnerVariation(Permission permission) {
if (permission.Name == Permissions.PublishOthersContent.Name) if (permission.Name == Permissions.PublishContent.Name)
return Permissions.PublishOwnContent; return Permissions.PublishOwnContent;
if (permission.Name == Permissions.EditOthersContent.Name) if (permission.Name == Permissions.EditContent.Name)
return Permissions.EditOwnContent; return Permissions.EditOwnContent;
if (permission.Name == Permissions.DeleteOthersContent.Name) if (permission.Name == Permissions.DeleteContent.Name)
return Permissions.DeleteOwnContent; return Permissions.DeleteOwnContent;
return null; return null;
} }

2
src/Orchard.Web/Core/Contents/Views/Content.ControlWrapper.cshtml
View File

@ -1,6 +1,6 @@
@using Orchard.ContentManagement; @using Orchard.ContentManagement;
@using Orchard.Core.Contents; @using Orchard.Core.Contents;
@if (AuthorizedFor(Permissions.EditOthersContent)) { @if (AuthorizedFor(Permissions.EditContent)) {
<div class="content-control"> <div class="content-control">
<div class="manage-actions">@Html.ItemEditLinkWithReturnUrl(T("Edit").Text, (ContentItem)Model.ContentItem)</div> <div class="manage-actions">@Html.ItemEditLinkWithReturnUrl(T("Edit").Text, (ContentItem)Model.ContentItem)</div>
@Display(Model.Child) @Display(Model.Child)

2
src/Orchard.Web/Modules/Orchard.ArchiveLater/Services/ArchiveLaterService.cs
View File

@ -24,7 +24,7 @@ namespace Orchard.ArchiveLater.Services {
public Localizer T { get; set; } public Localizer T { get; set; }
void IArchiveLaterService.ArchiveLater(ContentItem contentItem, DateTime scheduledArchiveUtc) { void IArchiveLaterService.ArchiveLater(ContentItem contentItem, DateTime scheduledArchiveUtc) {
if (!Services.Authorizer.Authorize(Permissions.PublishOthersContent, contentItem, T("Couldn't archive selected content."))) if (!Services.Authorizer.Authorize(Permissions.PublishContent, contentItem, T("Couldn't archive selected content.")))
return; return;
RemoveArchiveLaterTasks(contentItem); RemoveArchiveLaterTasks(contentItem);

2
src/Orchard.Web/Modules/Orchard.Localization/Views/Parts/Localization.ContentTranslations.Summary.cshtml
View File

@ -1,6 +1,6 @@
@using Orchard.Core.Contents; @using Orchard.Core.Contents;
@using Orchard.Localization.Models; @using Orchard.Localization.Models;
@if (AuthorizedFor(Permissions.PublishOthersContent)) { @if (AuthorizedFor(Permissions.PublishContent)) {
Style.Require("LocalizationAdmin"); Style.Require("LocalizationAdmin");
IEnumerable<LocalizationPart> localizations = Model.Localizations; IEnumerable<LocalizationPart> localizations = Model.Localizations;
var localizationLinks = Html.UnorderedList(localizations, (c, i) => Html.ItemEditLink(c.Culture.Culture, c), "localizations"); var localizationLinks = Html.UnorderedList(localizations, (c, i) => Html.ItemEditLink(c.Culture.Culture, c), "localizations");

2
src/Orchard.Web/Modules/Orchard.Localization/Views/Parts/Localization.ContentTranslations.SummaryAdmin.cshtml
View File

@ -1,6 +1,6 @@
@using Orchard.Core.Contents; @using Orchard.Core.Contents;
@using Orchard.Localization.Models; @using Orchard.Localization.Models;
@if (AuthorizedFor(Permissions.PublishOthersContent)) { @if (AuthorizedFor(Permissions.PublishContent)) {
Style.Require("LocalizationAdmin"); Style.Require("LocalizationAdmin");
IEnumerable<LocalizationPart> localizations = Model.Localizations; IEnumerable<LocalizationPart> localizations = Model.Localizations;
var localizationLinks = Html.UnorderedList(localizations, (c, i) => Html.ItemEditLink(c.Culture.Culture, c), "localizations"); var localizationLinks = Html.UnorderedList(localizations, (c, i) => Html.ItemEditLink(c.Culture.Culture, c), "localizations");

2
src/Orchard.Web/Modules/Orchard.PublishLater/Services/PublishLaterService.cs
View File

@ -21,7 +21,7 @@ namespace Orchard.PublishLater.Services {
public Localizer T { get; set; } public Localizer T { get; set; }
void IPublishLaterService.Publish(ContentItem contentItem, DateTime scheduledPublishUtc) { void IPublishLaterService.Publish(ContentItem contentItem, DateTime scheduledPublishUtc) {
if (!Services.Authorizer.Authorize(Permissions.PublishOthersContent, contentItem, T("Couldn't publish selected content."))) if (!Services.Authorizer.Authorize(Permissions.PublishContent, contentItem, T("Couldn't publish selected content.")))
return; return;
_publishingTaskManager.Publish(contentItem, scheduledPublishUtc); _publishingTaskManager.Publish(contentItem, scheduledPublishUtc);