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

removes CloneXmlContent from umbraco settings

Browse Source
This commit is contained in:
Shannon
2019-01-31 00:09:30 +11:00
parent 06cf8abfee
commit d852422328
6 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
build/NuSpecs/tools/Web.config.install.xdt
View File

@@ -4,13 +4,11 @@
<configSections>
<section name="ExamineLuceneIndexSets" type="Umbraco.Examine.Config.IndexSets, Umbraco.Examine" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="SetAttributes(type,requirePermission)" />
<sectionGroup name="applicationSettings" xdt:Locator="Match(name)">
<section name="umbraco.presentation.Properties.Settings" xdt:Locator="Match(name)" xdt:Transform="Remove" />
</sectionGroup>
<sectionGroup name="applicationSettings" xdt:Locator="Match(name)" xdt:Transform="Remove" />
<sectionGroup name="system.web.webPages.razor" xdt:Locator="Match(name)" xdt:Transform="Remove" />
<sectionGroup name="umbracoConfiguration" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing">
<section name="settings" type="Umbraco.Core.Configuration.UmbracoSettings.UmbracoSettingsSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
<section name="dashBoard" type="Umbraco.Core.Configuration.Dashboard.DashboardSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
<section name="dashBoard" xdt:Locator="Match(name)" xdt:Transform="Remove" />
<section name="HealthChecks" type="Umbraco.Core.Configuration.HealthChecks.HealthChecksSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
</sectionGroup>
</configSections>
@@ -25,7 +23,7 @@
<umbracoConfiguration xdt:Transform="InsertIfMissing">
<settings configSource="config\umbracoSettings.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
<dashBoard configSource="config\Dashboard.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
<dashBoard configSource="config\Dashboard.config" xdt:Locator="Match(configSource)" xdt:Transform="Remove" />
<HealthChecks configSource="config\HealthChecks.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
</umbracoConfiguration>

7
src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
View File

@@ -36,10 +36,7 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
[ConfigurationProperty("allowedUploadFiles")]
internal CommaDelimitedConfigurationElement AllowedUploadFiles => GetOptionalDelimitedElement("allowedUploadFiles", new string[0]);
[ConfigurationProperty("cloneXmlContent")]
internal InnerTextConfigurationElement<bool> CloneXmlContent => GetOptionalTextElement("cloneXmlContent", true);
[ConfigurationProperty("GlobalPreviewStorageEnabled")]
internal InnerTextConfigurationElement<bool> GlobalPreviewStorageEnabled => GetOptionalTextElement("GlobalPreviewStorageEnabled", false);
@@ -76,8 +73,6 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
IEnumerable<string> IContentSection.AllowedUploadFiles => AllowedUploadFiles;
bool IContentSection.CloneXmlContent => CloneXmlContent;
bool IContentSection.GlobalPreviewStorageEnabled => GlobalPreviewStorageEnabled;
string IContentSection.DefaultDocumentTypeProperty => DefaultDocumentTypeProperty;

2
src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
View File

@@ -25,8 +25,6 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
IEnumerable<string> AllowedUploadFiles { get; }
bool CloneXmlContent { get; }
bool GlobalPreviewStorageEnabled { get; }
string DefaultDocumentTypeProperty { get; }

5
src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
View File

@@ -74,11 +74,6 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings
{
Assert.IsFalse(SettingsSection.Content.GlobalPreviewStorageEnabled);
}
[Test]
public void CloneXmlContent()
{
Assert.IsTrue(SettingsSection.Content.CloneXmlContent);
}
[Test]
public void PreviewBadge()

2
src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
View File

@@ -40,8 +40,6 @@
<disableHtmlEmail>true</disableHtmlEmail>
</notifications>
<cloneXmlContent>true</cloneXmlContent>
<PreviewBadge>
<![CDATA[
<a id="umbracoPreviewBadge" style="z-index:99999; position: absolute; top: 0; right: 0; border: 0; width: 149px; height: 149px; background: url('{0}/assets/img/preview-mode-badge.png') no-repeat;" href="#" OnClick="javascript:window.top.location.href = '{0}/preview/end?redir={1}'"><span style="display:none;">In Preview Mode - click to end</span></a>

2
src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs
View File

@@ -263,7 +263,7 @@ namespace Umbraco.Tests.LegacyXmlPublishedCache
private bool SyncFromXmlFile => false;
// whether _xml is immutable or not (achieved by cloning before changing anything)
private static bool XmlIsImmutable => Current.Configs.Settings().Content.CloneXmlContent;
private static bool XmlIsImmutable => true;
// whether to keep version of everything (incl. medias & members) in cmsPreviewXml
// for audit purposes - false by default, not in umbracoSettings.config