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

Merge branch '1.9.x' into dev

Browse Source 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Taxonomies/Views/EditorTemplates/Fields/TaxonomyField.Autocomplete.cshtml
	src/Orchard.Web/Modules/Orchard.Taxonomies/Views/EditorTemplates/Fields/TaxonomyField.cshtml
This commit is contained in:
Sipke Schoorstra
2015-07-17 09:52:23 +01:00
parent 0d0bac8765 ddaf49db4a
commit e562f6adbd
15 changed files with 102 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Modules/Orchard.Layouts/Providers/ContentPartElementHarvester.cs
View File

@@ -57,7 +57,7 @@ namespace Orchard.Layouts.Providers {
? contentTypeDefinition.Parts.Select(x => x.PartDefinition)
: _contentDefinitionManager.Value.ListPartDefinitions();
return parts.Where(p => p.Settings.GetModel<ContentPartLayoutSettings>().Placable);
return parts.Where(p => p.Settings.GetModel<ContentPartLayoutSettings>().Placeable);
}
private void Displaying(ElementDisplayingContext context) {