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

Working on #U4-2144 - ensures that xml is re-gen'd when a property alias is changed.

Browse Source
This commit is contained in:
Shannon Deminick
2013-04-24 15:17:20 -10:00
parent 0e8ffe528a
commit b4caf109f7
1 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
View File

@@ -124,23 +124,47 @@ namespace umbraco.controls
/// </summary>
private class SaveAsyncState
{
public SaveAsyncState(SaveClickEventArgs saveArgs, string originalAlias, string originalName)
public SaveAsyncState(
SaveClickEventArgs saveArgs,
string originalAlias,
string originalName,
string[] originalPropertyAliases)
{
SaveArgs = saveArgs;
OriginalAlias = originalAlias;
OriginalName = originalName;
_originalAlias = originalAlias;
_originalName = originalName;
_originalPropertyAliases = originalPropertyAliases;
}
public SaveClickEventArgs SaveArgs { get; private set; }
public string OriginalAlias { get; private set; }
public string OriginalName { get; private set; }
private readonly string _originalAlias;
private readonly string _originalName;
private readonly string[] _originalPropertyAliases;
public bool HasAliasChanged(ContentType contentType)
{
return (string.Compare(OriginalAlias, contentType.Alias, StringComparison.OrdinalIgnoreCase) != 0);
return (string.Compare(_originalAlias, contentType.Alias, StringComparison.OrdinalIgnoreCase) != 0);
}
public bool HasNameChanged(ContentType contentType)
{
return (string.Compare(OriginalName, contentType.Text, StringComparison.OrdinalIgnoreCase) != 0);
return (string.Compare(_originalName, contentType.Text, StringComparison.OrdinalIgnoreCase) != 0);
}
/// <summary>
/// Returns true if any property has been removed or if any alias has changed
/// </summary>
/// <param name="contentType"></param>
/// <returns></returns>
public bool HasAnyPropertyAliasChanged(ContentType contentType)
{
var newAliases = contentType.PropertyTypes.Select(x => x.Alias).ToArray();
//if any have been removed, return true
if (newAliases.Length < _originalPropertyAliases.Count())
{
return true;
}
//otherwise ensure that all of the original aliases are still existing
return newAliases.ContainsAll(_originalPropertyAliases) == false;
}
}
@@ -221,7 +245,7 @@ namespace umbraco.controls
var state = new SaveAsyncState(new SaveClickEventArgs("Saved")
{
IconType = BasePage.speechBubbleIcon.success
}, _contentType.Alias, _contentType.Text);
}, _contentType.Alias, _contentType.Text, _contentType.PropertyTypes.Select(x => x.Alias).ToArray());
//Add the async operation to the page
Page.RegisterAsyncTask(new PageAsyncTask(BeginAsyncSaveOperation, EndAsyncSaveOperation, HandleAsyncSaveTimeout, state));
@@ -245,7 +269,7 @@ namespace umbraco.controls
// Only if the doctype alias changed, cause a regeneration of the xml cache file since
// the xml element names will need to be updated to reflect the new alias
if (asyncState.HasAliasChanged(_contentType))
if (asyncState.HasAliasChanged(_contentType) || asyncState.HasAnyPropertyAliasChanged(_contentType))
RegenerateXmlCaches();
Trace.Write("ContentTypeControlNew", "task completing");