lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-14 02:44:52 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Bug 17262 Theme: Layout.cshtml has to be uppercase.

Browse Source 
Fixing the Template Harvester to be case insensitive

--HG--
branch : dev
This commit is contained in:
Suha Can
2011-01-31 17:19:14 -08:00
parent 9adfa13a56
commit fcaaa4e236
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Tests/DisplayManagement/Descriptors/BasicShapeTemplateHarvesterTests.cs
View File

@@ -9,7 +9,7 @@ namespace Orchard.Tests.DisplayManagement.Descriptors {
var harvester = new BasicShapeTemplateHarvester(); var harvester = new BasicShapeTemplateHarvester();
var harvestShapeHits = harvester.HarvestShape(new HarvestShapeInfo { SubPath = givenSubPath, FileName = givenFileName }); var harvestShapeHits = harvester.HarvestShape(new HarvestShapeInfo { SubPath = givenSubPath, FileName = givenFileName });
Assert.That(harvestShapeHits.Count(), Is.EqualTo(1)); Assert.That(harvestShapeHits.Count(), Is.EqualTo(1));
Assert.That(harvestShapeHits.Single().ShapeType, Is.EqualTo(expectedShapeType)); Assert.That(harvestShapeHits.Single().ShapeType, Is.EqualTo(expectedShapeType).IgnoreCase);
} }
[Test] [Test]

2
src/Orchard.Tests/DisplayManagement/Descriptors/ShapeTemplateBindingStrategyTests.cs
View File

@@ -140,7 +140,7 @@ namespace Orchard.Tests.DisplayManagement.Descriptors {
strategy.Discover(builder); strategy.Discover(builder);
var alterations = alterationBuilders.Select(alterationBuilder=>alterationBuilder.Build()); var alterations = alterationBuilders.Select(alterationBuilder=>alterationBuilder.Build());
Assert.That(alterations.Any(alteration => alteration.ShapeType == "AlphaShape")); Assert.That(alterations.Any(alteration => alteration.ShapeType.Equals("AlphaShape", StringComparison.OrdinalIgnoreCase)));
} }
} }

6
src/Orchard/DisplayManagement/Descriptors/ShapeTemplateStrategy/IShapeTemplateHarvester.cs
View File

@@ -44,14 +44,14 @@ namespace Orchard.DisplayManagement.Descriptors.ShapeTemplateStrategy {
var shapeType = leader + fileName.Replace("--", "__").Replace("-", "__").Replace('.', '_'); var shapeType = leader + fileName.Replace("--", "__").Replace("-", "__").Replace('.', '_');
if (string.IsNullOrEmpty(displayType)) { if (string.IsNullOrEmpty(displayType)) {
return shapeType; return shapeType.ToLowerInvariant();
} }
var firstBreakingSeparator = shapeType.IndexOf("__"); var firstBreakingSeparator = shapeType.IndexOf("__");
if (firstBreakingSeparator <= 0) { if (firstBreakingSeparator <= 0) {
return shapeType + "_" + displayType; return (shapeType + "_" + displayType).ToLowerInvariant();
} }
return shapeType.Substring(0, firstBreakingSeparator) + "_" + displayType + shapeType.Substring(firstBreakingSeparator); return (shapeType.Substring(0, firstBreakingSeparator) + "_" + displayType + shapeType.Substring(firstBreakingSeparator)).ToLowerInvariant();
} }
} }