yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7

Browse Source
This commit is contained in:
Sebastiaan Janssen
2018-08-31 20:21:58 +02:00
parent ec1d2a6433 222720aea4
commit 61ce1bcdca
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Umbraco.Web.UI/umbraco/config/lang/en.xml
View File

@@ -480,6 +480,7 @@
<key alias="currentListViewDesc" version="7.2">The active list view data type</key>
<key alias="createListView" version="7.2">Create custom list view</key>
<key alias="removeListView" version="7.2">Remove custom list view</key>
<key alias="aliasAlreadyExists">A content type, media type or member type with this alias already exists</key>
</area>
<area alias="renamecontainer">
<key alias="renamed">Renamed</key>

1
src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
View File

@@ -480,6 +480,7 @@
<key alias="currentListViewDesc" version="7.2">The active list view data type</key>
<key alias="createListView" version="7.2">Create custom list view</key>
<key alias="removeListView" version="7.2">Remove custom list view</key>
<key alias="aliasAlreadyExists">A content type, media type or member type with this alias already exists</key>
</area>
<area alias="renamecontainer">
<key alias="renamed">Renamed</key>

4
src/Umbraco.Web/Editors/ContentTypeControllerBase.cs
View File

@@ -227,9 +227,9 @@ namespace Umbraco.Web.Editors
// works since that is based on aliases.
var allAliases = Services.ContentTypeService.GetAllContentTypeAliases();
var exists = allAliases.InvariantContains(contentTypeSave.Alias);
if ((exists) && (ctId == 0 || ct.Alias != contentTypeSave.Alias))
if (exists && (ctId == 0 || ct.Alias.InvariantEquals(contentTypeSave.Alias) == false))
{
ModelState.AddModelError("Alias", "A content type, media type or member type with this alias already exists");
ModelState.AddModelError("Alias", Services.TextService.Localize("editcontenttype/aliasAlreadyExists"));
}
//now let the external validators execute