lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixes #6168: Generating TechnicalName for ContenTypes, ContentFields creates disallowed names

Browse Source 
Removed separator
This commit is contained in:
Szymon Seliga
2015-12-14 14:48:31 +01:00
parent df4f4234bd
commit cf6a88c6f7
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Orchard.Web/Modules/Orchard.ContentTypes/Services/ContentDefinitionService.cs
View File

@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text.RegularExpressions;
using Orchard.ContentManagement;
using Orchard.ContentManagement.Drivers;
using Orchard.ContentManagement.MetaData;
@@ -358,18 +359,17 @@ namespace Orchard.ContentTypes.Services {
private static string VersionName(string name) {
int version;
var nameParts = name.Split(new[] { '-' }, StringSplitOptions.RemoveEmptyEntries);
var substring = Regex.Match(name, @"\d+$").Value;
if (nameParts.Length > 1 && int.TryParse(nameParts.Last(), out version)) {
if (int.TryParse(substring, out version)) {
name = name.Remove(name.Length - substring.Length);
version = version > 0 ? ++version : 2;
//this could unintentionally chomp something that looks like a version
name = string.Join("-", nameParts.Take(nameParts.Length - 1));
}
else {
version = 2;
}
return string.Format("{0}-{1}", name, version);
return name + version;
}
}
}