lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-09-18 17:47:54 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch '1.10'

Browse Source
This commit is contained in:
Daniel Stolt
2016-02-22 13:59:36 +01:00
parent a2344de0a1 cb06c7576c
commit ea7404a6ef
5 changed files with 70 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleCsProj.txt
View File

@@ -12,7 +12,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>$$ModuleName$$</RootNamespace> <RootNamespace>$$ModuleName$$</RootNamespace>
<AssemblyName>$$ModuleName$$</AssemblyName> <AssemblyName>$$ModuleName$$</AssemblyName>
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<MvcBuildViews>false</MvcBuildViews> <MvcBuildViews>false</MvcBuildViews>
<FileUpgradeFlags> <FileUpgradeFlags>
</FileUpgradeFlags> </FileUpgradeFlags>
@@ -46,20 +46,23 @@
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit> <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.ComponentModel.DataAnnotations"> <Reference Include="System.ComponentModel.DataAnnotations">
<RequiredTargetFramework>3.5</RequiredTargetFramework> <RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference> </Reference>
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Web.ApplicationServices" />
<Reference Include="System.Web.DynamicData" /> <Reference Include="System.Web.DynamicData" />
<Reference Include="System.Web.Entity" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Web.Mvc, Version=5.2.3, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="System.Web.Mvc, Version=5.2.3, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath> <HintPath>..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Web" /> <Reference Include="System.Web" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Web.Abstractions" /> <Reference Include="System.Web.Abstractions" />
<Reference Include="System.Web.Routing" /> <Reference Include="System.Web.Routing" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />

53
src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleRootWebConfig.txt
View File

@@ -1,41 +1,66 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<configuration> <configuration>
<configSections> <configSections>
<sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"> <sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
<section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" /> <section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false"/>
<section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" /> <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false"/>
</sectionGroup> </sectionGroup>
</configSections> </configSections>
<system.web.webPages.razor> <system.web.webPages.razor>
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.3, Culture=neutral, PublicKeyToken=31bf3856ad364e35" /> <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.3, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<pages pageBaseType="Orchard.Mvc.ViewEngines.Razor.WebViewPage"> <pages pageBaseType="Orchard.Mvc.ViewEngines.Razor.WebViewPage">
<namespaces> <namespaces>
<add namespace="System.Web.Mvc" /> <add namespace="System.Web.Mvc"/>
<add namespace="System.Web.Mvc.Ajax" /> <add namespace="System.Web.Mvc.Ajax"/>
<add namespace="System.Web.Mvc.Html" /> <add namespace="System.Web.Mvc.Html"/>
<add namespace="System.Web.Routing" /> <add namespace="System.Web.Routing"/>
<add namespace="System.Web.WebPages" /> <add namespace="System.Web.WebPages"/>
<add namespace="System.Linq"/> <add namespace="System.Linq"/>
<add namespace="System.Collections.Generic"/> <add namespace="System.Collections.Generic"/>
<add namespace="Orchard.Mvc.Html"/> <add namespace="Orchard.Mvc.Html"/>
</namespaces> </namespaces>
</pages> </pages>
</system.web.webPages.razor> </system.web.webPages.razor>
<!--
For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
The following attributes can be set on the <httpRuntime> tag.
<system.Web>
<httpRuntime targetFramework="4.5.2" />
</system.Web>
-->
<system.web> <system.web>
<compilation targetFramework="4.5.1"> <compilation targetFramework="4.5.2">
<assemblies> <assemblies>
<add assembly="System.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" /> <add assembly="System.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
<add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/> <add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/> <add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<add assembly="System.Data.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/> <add assembly="System.Data.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
<add assembly="System.Web.Mvc, Version=5.2.3, Culture=neutral, PublicKeyToken=31bf3856ad364e35" /> <add assembly="System.Web.Mvc, Version=5.2.3, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<add assembly="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/> <add assembly="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<add assembly="Orchard.Framework,Culture=neutral, PublicKeyToken=null"/> <add assembly="Orchard.Framework,Culture=neutral, PublicKeyToken=null"/>
<add assembly="Orchard.Core,Culture=neutral, PublicKeyToken=null"/> <add assembly="Orchard.Core,Culture=neutral, PublicKeyToken=null"/>
</assemblies> </assemblies>
</compilation> </compilation>
</system.web> </system.web>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30AD4FE6B2A6AEED" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NHibernate" publicKeyToken="AA95F207798DFDB4" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.4000" newVersion="4.0.0.4000"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Iesi.Collections" publicKeyToken="AA95F207798DFDB4" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Autofac" publicKeyToken="17863AF14B0044DA" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-3.5.0.0" newVersion="3.5.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration> </configuration>

2
src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleTestsCsProj.txt
View File

@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>$$ProjectName$$</RootNamespace> <RootNamespace>$$ProjectName$$</RootNamespace>
<AssemblyName>$$ProjectName$$</AssemblyName> <AssemblyName>$$ProjectName$$</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<OldToolsVersion>4.0</OldToolsVersion> <OldToolsVersion>4.0</OldToolsVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

39
src/Orchard.Web/Modules/Orchard.Layouts/Providers/SnippetElementHarvester.cs
View File

@@ -32,12 +32,13 @@ namespace Orchard.Layouts.Providers {
private readonly Work<IShapeDisplay> _shapeDisplay; private readonly Work<IShapeDisplay> _shapeDisplay;
private readonly Work<ICurrentThemeShapeBindingResolver> _currentThemeShapeBindingResolver; private readonly Work<ICurrentThemeShapeBindingResolver> _currentThemeShapeBindingResolver;
private readonly Work<ITokenizer> _tokenizer; private readonly Work<ITokenizer> _tokenizer;
private readonly IWorkContextAccessor _wca;
public SnippetElementHarvester( public SnippetElementHarvester(
IWorkContextAccessor workContextAccessor, IWorkContextAccessor workContextAccessor,
Work<IShapeFactory> shapeFactory, Work<IShapeFactory> shapeFactory,
Work<ISiteThemeService> siteThemeService, Work<ISiteThemeService> siteThemeService,
Work<IShapeTableLocator> shapeTableLocator, Work<IShapeTableLocator> shapeTableLocator,
Work<IElementFactory> elementFactory, Work<IElementFactory> elementFactory,
Work<IShapeDisplay> shapeDisplay, Work<IShapeDisplay> shapeDisplay,
Work<ITokenizer> tokenizer, Work<ITokenizer> tokenizer,
@@ -50,27 +51,26 @@ namespace Orchard.Layouts.Providers {
_shapeDisplay = shapeDisplay; _shapeDisplay = shapeDisplay;
_tokenizer = tokenizer; _tokenizer = tokenizer;
_currentThemeShapeBindingResolver = currentThemeShapeBindingResolver; _currentThemeShapeBindingResolver = currentThemeShapeBindingResolver;
workContextAccessor.GetContext(); _wca = workContextAccessor;
} }
public IEnumerable<ElementDescriptor> HarvestElements(HarvestElementsContext context) { public IEnumerable<ElementDescriptor> HarvestElements(HarvestElementsContext context) {
var currentThemeName = _siteThemeService.Value.GetCurrentThemeName(); var currentThemeName = _siteThemeService.Value.GetCurrentThemeName();
var shapeTable = _shapeTableLocator.Value.Lookup(currentThemeName); var shapeTable = _shapeTableLocator.Value.Lookup(currentThemeName);
var shapeDescriptors = shapeTable.Bindings.Where(x => !String.Equals(x.Key, "Elements_Snippet", StringComparison.OrdinalIgnoreCase) && x.Key.EndsWith(SnippetShapeSuffix, StringComparison.OrdinalIgnoreCase)).ToDictionary(x => x.Key, x => x.Value.ShapeDescriptor); var shapeDescriptors = shapeTable.Bindings.Where(x => !String.Equals(x.Key, "Elements_Snippet", StringComparison.OrdinalIgnoreCase) && x.Key.EndsWith(SnippetShapeSuffix, StringComparison.OrdinalIgnoreCase)).ToDictionary(x => x.Key, x => x.Value.ShapeDescriptor);
var elementType = typeof (Snippet); var elementType = typeof(Snippet);
var snippetElement = (Snippet)_elementFactory.Value.Activate(elementType); var snippetElement = (Snippet)_elementFactory.Value.Activate(elementType);
foreach (var shapeDescriptor in shapeDescriptors) { foreach (var shapeDescriptor in shapeDescriptors) {
var shapeType = shapeDescriptor.Value.ShapeType; var shapeType = shapeDescriptor.Value.ShapeType;
var snippetDescriptor = DescribeSnippet(shapeType, snippetElement);
var elementName = GetDisplayName(shapeDescriptor.Value.BindingSource); var elementName = GetDisplayName(shapeDescriptor.Value.BindingSource);
var closureDescriptor = shapeDescriptor; var closureDescriptor = shapeDescriptor;
yield return new ElementDescriptor(elementType, shapeType, T(elementName), T("An element that renders the {0} shape.", shapeType), snippetElement.Category) { yield return new ElementDescriptor(elementType, shapeType, T(elementName), T("An element that renders the {0} shape.", shapeType), snippetElement.Category) {
Displaying = displayContext => Displaying(displayContext, closureDescriptor.Value, snippetDescriptor), Displaying = displayContext => Displaying(displayContext, closureDescriptor.Value),
ToolboxIcon = "\uf10c", ToolboxIcon = "\uf10c",
EnableEditorDialog = snippetDescriptor.Fields.Any(), EnableEditorDialog = HasSnippetFields(shapeDescriptor.Value),
Editor = ctx => Editor(snippetDescriptor, ctx), Editor = ctx => Editor(DescribeSnippet(shapeType, snippetElement), ctx),
UpdateEditor = ctx => UpdateEditor(snippetDescriptor, ctx) UpdateEditor = ctx => UpdateEditor(DescribeSnippet(shapeType, snippetElement), ctx)
}; };
} }
} }
@@ -83,7 +83,7 @@ namespace Orchard.Layouts.Providers {
var viewModel = new SnippetViewModel { var viewModel = new SnippetViewModel {
Descriptor = descriptor Descriptor = descriptor
}; };
if (context.Updater != null) { if (context.Updater != null) {
foreach (var fieldDescriptor in descriptor.Fields) { foreach (var fieldDescriptor in descriptor.Fields) {
var name = fieldDescriptor.Name; var name = fieldDescriptor.Name;
@@ -109,20 +109,18 @@ namespace Orchard.Layouts.Providers {
var snippetEditorShape = context.ShapeFactory.EditorTemplate(TemplateName: "Elements.Snippet", Model: viewModel, Prefix: context.Prefix); var snippetEditorShape = context.ShapeFactory.EditorTemplate(TemplateName: "Elements.Snippet", Model: viewModel, Prefix: context.Prefix);
snippetEditorShape.Metadata.Position = "Fields:0"; snippetEditorShape.Metadata.Position = "Fields:0";
context.EditorResult.Add(snippetEditorShape); context.EditorResult.Add(snippetEditorShape);
} }
private void Displaying(ElementDisplayingContext context, ShapeDescriptor shapeDescriptor, SnippetDescriptor snippetDescriptor) { private void Displaying(ElementDisplayingContext context, ShapeDescriptor shapeDescriptor) {
var shapeType = shapeDescriptor.ShapeType; var shapeType = shapeDescriptor.ShapeType;
var shape = (dynamic)_shapeFactory.Value.Create(shapeType); var shape = (dynamic)_shapeFactory.Value.Create(shapeType);
shape.Element = context.Element; shape.Element = context.Element;
shape.SnippetDescriptor = snippetDescriptor;
ElementShapes.AddTokenizers(shape, _tokenizer.Value); ElementShapes.AddTokenizers(shape, _tokenizer.Value);
context.ElementShape.Snippet = shape; context.ElementShape.Snippet = shape;
context.ElementShape.SnippetDescriptor = snippetDescriptor;
} }
private string GetDisplayName(string bindingSource) { private string GetDisplayName(string bindingSource) {
@@ -140,9 +138,9 @@ namespace Orchard.Layouts.Providers {
private SnippetDescriptor DescribeSnippet(dynamic shape) { private SnippetDescriptor DescribeSnippet(dynamic shape) {
// Execute the shape and intercept calls to the Html.SnippetField method. // Execute the shape and intercept calls to the Html.SnippetField method.
var descriptor = new SnippetDescriptor(); var descriptor = new SnippetDescriptor();
shape.DescriptorRegistrationCallback = (Action<SnippetFieldDescriptor>) (fieldDescriptor => { shape.DescriptorRegistrationCallback = (Action<SnippetFieldDescriptor>)(fieldDescriptor => {
var existingDescriptor = descriptor.Fields.SingleOrDefault(x => x.Name == fieldDescriptor.Name); // Not using Dictionary, as that will break rendering the view for some obscure reason. var existingDescriptor = descriptor.Fields.SingleOrDefault(x => x.Name == fieldDescriptor.Name); // Not using Dictionary, as that will break rendering the view for some obscure reason.
if (existingDescriptor == null) if (existingDescriptor == null)
descriptor.Fields.Add(fieldDescriptor); descriptor.Fields.Add(fieldDescriptor);
@@ -157,5 +155,16 @@ namespace Orchard.Layouts.Providers {
shape.SnippetDescriptor = descriptor; shape.SnippetDescriptor = descriptor;
return descriptor; return descriptor;
} }
private bool HasSnippetFields(ShapeDescriptor shapeDescriptor) {
var bindingSource = shapeDescriptor.BindingSource;
var localFileName = _wca.GetContext().HttpContext.Server.MapPath(bindingSource);
if (!File.Exists(localFileName))
return false;
var markup = File.ReadAllText(localFileName);
return markup.Contains("@Html.SnippetField");
}
} }
} }

10
src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/Snippet.Design.cshtml
View File

@@ -1,17 +1,7 @@
@using Orchard.Layouts.Elements @using Orchard.Layouts.Elements
@using Orchard.Layouts.Helpers
@using Orchard.Layouts.Models
@{ @{
var element = (Snippet) Model.Element; var element = (Snippet) Model.Element;
var snippetDescriptor = (SnippetDescriptor)Model.SnippetDescriptor;
} }
<div class="element-snippet layout-placeholder"> <div class="element-snippet layout-placeholder">
@T("{0} Snippet", element.Descriptor.DisplayText) @T("{0} Snippet", element.Descriptor.DisplayText)
@if (snippetDescriptor.Fields.Any()) {
<ul>
@foreach(var field in snippetDescriptor.Fields) {
<li>@field.DisplayName: @element.Data.Get(field.Name)</li>
}
</ul>
}
</div> </div>