lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge

Browse Source 
--HG--
branch : dev
This commit is contained in:
Erik Porter
2010-03-03 13:22:41 -08:00
parent f22cd057ba e9628c4c8f
commit 36fc37afd8
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Orchard.Web/Core/Common/Controllers/BodyDriver.cs
View File

@@ -23,10 +23,10 @@ namespace Orchard.Core.Common.Controllers {
var model = new BodyDisplayViewModel { BodyAspect = part, Text = BbcodeReplace(part.Text) }; var model = new BodyDisplayViewModel { BodyAspect = part, Text = BbcodeReplace(part.Text) };
return Combined( return Combined(
Services.Authorizer.Authorize(Permissions.ChangeOwner) ? ContentPartTemplate(model, "Parts/ManageWrapperPre").Location("primary", "5") : null, Services.Authorizer.Authorize(Permissions.ChangeOwner) ? ContentPartTemplate(model, "Parts/Common.Body.ManageWrapperPre").Location("primary", "5") : null,
Services.Authorizer.Authorize(Permissions.ChangeOwner) ? ContentPartTemplate(model, "Parts/Manage").Location("primary", "5") : null, Services.Authorizer.Authorize(Permissions.ChangeOwner) ? ContentPartTemplate(model, "Parts/Common.Body.Manage").Location("primary", "5") : null,
ContentPartTemplate(model, TemplateName, Prefix).LongestMatch(displayType, "Summary", "SummaryAdmin").Location("primary", "5"), ContentPartTemplate(model, TemplateName, Prefix).LongestMatch(displayType, "Summary", "SummaryAdmin").Location("primary", "5"),
Services.Authorizer.Authorize(Permissions.ChangeOwner) ? ContentPartTemplate(model, "Parts/ManageWrapperPost").Location("primary", "5") : null); Services.Authorizer.Authorize(Permissions.ChangeOwner) ? ContentPartTemplate(model, "Parts/Common.Body.ManageWrapperPost").Location("primary", "5") : null);
} }
protected override DriverResult Editor(BodyAspect part) { protected override DriverResult Editor(BodyAspect part) {

0
src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Manage.ascx → src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.Manage.ascx
View File

0
src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/ManageWrapperPost.ascx → src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.ManageWrapperPost.ascx
View File

0
src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/ManageWrapperPre.ascx → src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.ManageWrapperPre.ascx
View File

6
src/Orchard.Web/Core/Orchard.Core.csproj
View File

@@ -226,9 +226,9 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="Common\Views\DisplayTemplates\Parts\Common.Body.Summary.ascx" /> <Content Include="Common\Views\DisplayTemplates\Parts\Common.Body.Summary.ascx" />
<Content Include="Common\Views\DisplayTemplates\Parts\ManageWrapperPost.ascx" /> <Content Include="Common\Views\DisplayTemplates\Parts\Common.Body.ManageWrapperPost.ascx" />
<Content Include="Common\Views\DisplayTemplates\Parts\ManageWrapperPre.ascx" /> <Content Include="Common\Views\DisplayTemplates\Parts\Common.Body.ManageWrapperPre.ascx" />
<Content Include="Common\Views\DisplayTemplates\Parts\Manage.ascx" /> <Content Include="Common\Views\DisplayTemplates\Parts\Common.Body.Manage.ascx" />
<Content Include="Dashboard\Views\Web.config" /> <Content Include="Dashboard\Views\Web.config" />
<Content Include="Themes\Styles\special.css" /> <Content Include="Themes\Styles\special.css" />
<Content Include="Themes\Views\NotFound.ascx" /> <Content Include="Themes\Views\NotFound.ascx" />