+ WebNavigationSettingsDefinition - missed impl for AddNewPagesToNavi…

…gation/CreateFriendlyUrlsForNewPages props SubPointSolutions#906
digital88 · Oct 24, 2016 · 2228fd6 · 2228fd6
1 parent dba2270
commit 2228fd6
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 18 deletions.
diff --git a/...2/SPMeta2.Regression.CSOM.Standard/Validation/WebNavigationSettingsDefinitionValidator.cs b/...2/SPMeta2.Regression.CSOM.Standard/Validation/WebNavigationSettingsDefinitionValidator.cs
@@ -209,7 +209,7 @@ public override void DeployModel(object modelHost, DefinitionBase model)
 
  var isGlobalNavIncludeTypesValid = false;
 
- if (definition.CurrentNavigationShowSubsites.Value)
+ if (definition.CurrentNavigationShowPages.Value)
  {
  isGlobalNavIncludeTypesValid =
  ((currentNavIncludeTypesValue & 2) == 2) && (currentIncludeSubSitesValue);
@@ -363,7 +363,7 @@ public override void DeployModel(object modelHost, DefinitionBase model)
  {
  assert.ShouldBeEqual((p, s, d) =>
  {
- var srcProp = s.GetExpressionValue(m => m.AddNewPagesToNavigation.Value);
+ var srcProp = s.GetExpressionValue(m => m.AddNewPagesToNavigation);
 
  return new PropertyValidationResult
  {
@@ -392,7 +392,7 @@ public override void DeployModel(object modelHost, DefinitionBase model)
  {
  assert.ShouldBeEqual((p, s, d) =>
  {
- var srcProp = s.GetExpressionValue(m => m.CreateFriendlyUrlsForNewPages.Value);
+ var srcProp = s.GetExpressionValue(m => m.CreateFriendlyUrlsForNewPages);
 
  return new PropertyValidationResult
  {

diff --git a/...2/SPMeta2.Regression.SSOM.Standard/Validation/WebNavigationSettingsDefinitionValidator.cs b/...2/SPMeta2.Regression.SSOM.Standard/Validation/WebNavigationSettingsDefinitionValidator.cs
@@ -268,11 +268,12 @@ public override void DeployModel(object modelHost, DefinitionBase model)
 
  if (definition.AddNewPagesToNavigation.HasValue)
  {
- if (!string.IsNullOrEmpty(definition.GlobalNavigationSource) || !string.IsNullOrEmpty(definition.CurrentNavigationSource))
+ if (!string.IsNullOrEmpty(definition.GlobalNavigationSource)
+ || !string.IsNullOrEmpty(definition.CurrentNavigationSource))
  {
  assert.ShouldBeEqual((p, s, d) =>
  {
- var srcProp = s.GetExpressionValue(m => m.AddNewPagesToNavigation.Value);
+ var srcProp = s.GetExpressionValue(m => m.AddNewPagesToNavigation);
 
  return new PropertyValidationResult
  {
@@ -294,14 +295,15 @@ public override void DeployModel(object modelHost, DefinitionBase model)
  assert.SkipProperty(d => d.AddNewPagesToNavigation,
  "AddNewPagesToNavigation is null");
  }
- 
+
  if (definition.CreateFriendlyUrlsForNewPages.HasValue)
  {
- if (!string.IsNullOrEmpty(definition.GlobalNavigationSource) || !string.IsNullOrEmpty(definition.CurrentNavigationSource))
+ if (!string.IsNullOrEmpty(definition.GlobalNavigationSource)
+ || !string.IsNullOrEmpty(definition.CurrentNavigationSource))
  {
  assert.ShouldBeEqual((p, s, d) =>
  {
- var srcProp = s.GetExpressionValue(m => m.CreateFriendlyUrlsForNewPages.Value);
+ var srcProp = s.GetExpressionValue(m => m.CreateFriendlyUrlsForNewPages);
 
  return new PropertyValidationResult
  {

diff --git a/SPMeta2/SPMeta2.Regression.Tests/Impl/Scenarios/WebNavigationSettingsScenariosTest.cs b/SPMeta2/SPMeta2.Regression.Tests/Impl/Scenarios/WebNavigationSettingsScenariosTest.cs
@@ -550,9 +550,9 @@ public void CanDeploy_WebNavigationSettings_With_AddNewPages_And_FriendlyUrls()
  web.AddWebNavigationSettings(new WebNavigationSettingsDefinition()
  {
  AddNewPagesToNavigation = Rnd.Bool(),
- CreateFriendlyUrlsForNewPages = Rnd.Bool()
+ CreateFriendlyUrlsForNewPages = Rnd.Bool(),
 
- //GlobalNavigationSource = BuiltInStandardNavigationSources.PortalProvider,
+ GlobalNavigationSource = BuiltInStandardNavigationSources.PortalProvider,
  //GlobalNavigationShowSubsites = true,
  //GlobalNavigationShowPages = true,
 

diff --git a/SPMeta2/SPMeta2.SSOM.Standard/ModelHandlers/WebNavigationSettingsModelHandler.cs b/SPMeta2/SPMeta2.SSOM.Standard/ModelHandlers/WebNavigationSettingsModelHandler.cs
@@ -146,16 +146,16 @@ private void DeployNavigationSettings(object modelHost, WebModelHost webModelHos
  }
  }
  }
+ }
 
-  if (navigationModel.AddNewPagesToNavigation.HasValue)
-  {
-  thisWebNavSettings.AddNewPagesToNavigation = navigationModel.AddNewPagesToNavigation.Value;
-  }
+ if (navigationModel.AddNewPagesToNavigation.HasValue)
+ {
+ thisWebNavSettings.AddNewPagesToNavigation = navigationModel.AddNewPagesToNavigation.Value;
+ }
 
- if (navigationModel.CreateFriendlyUrlsForNewPages.HasValue)
- {
- thisWebNavSettings.CreateFriendlyUrlsForNewPages = navigationModel.CreateFriendlyUrlsForNewPages.Value;
- }
+ if (navigationModel.CreateFriendlyUrlsForNewPages.HasValue)
+ {
+ thisWebNavSettings.CreateFriendlyUrlsForNewPages = navigationModel.CreateFriendlyUrlsForNewPages.Value;
  }
 
  if (navigationModel.DisplayShowHideRibbonAction.HasValue)