Merge pull request #1562 from erwinvanhunen/dev

Added InSiteHierarchy
pnp · May 11, 2018 · 2e7fb31 · 2e7fb31
2 parents ee406db + 0d7647e
commit 2e7fb31
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 ### Added
 
 - Added -CollapseSpecification option to Submit-PnPSearchQuery
+- Added -InSiteHierarchy to Get-PnPField to search for fields in the site collection
 
 ### Changed
 - Fix for issue where using Add-PnPFile and setting Created and Modified did not update values

diff --git a/Commands/Fields/GetField.cs b/Commands/Fields/GetField.cs
@@ -32,6 +32,9 @@ public class GetField : PnPWebRetrievalsCmdlet<Field>
         [Parameter(Mandatory = false, HelpMessage = "Filter to the specified group")]
         public string Group;
 
+        [Parameter(Mandatory = false, ValueFromPipeline = false, HelpMessage = "Search site hierarchy for fields")]
+        public SwitchParameter InSiteHierarchy;
+
         protected override void ExecuteCmdlet()
         {
             if (List != null)
@@ -67,8 +70,10 @@ protected override void ExecuteCmdlet()
                 {
                     if (!string.IsNullOrEmpty(Group))
                     {
-                        WriteObject(fieldCollection.Where(f => f.Group.Equals(Group, StringComparison.InvariantCultureIgnoreCase)),true);
-                    } else {
+                        WriteObject(fieldCollection.Where(f => f.Group.Equals(Group, StringComparison.InvariantCultureIgnoreCase)), true);
+                    }
+                    else
+                    {
                         WriteObject(fieldCollection, true);
                     }
                 }
@@ -81,27 +86,62 @@ protected override void ExecuteCmdlet()
             {
                 if (Identity.Id == Guid.Empty && string.IsNullOrEmpty(Identity.Name))
                 {
-                    ClientContext.Load(SelectedWeb.Fields, fc => fc.IncludeWithDefaultProperties(RetrievalExpressions));
+                    if (InSiteHierarchy.IsPresent)
+                    {
+                        ClientContext.Load(SelectedWeb.AvailableFields, fc => fc.IncludeWithDefaultProperties(RetrievalExpressions));
+                    }
+                    else
+                    {
+                        ClientContext.Load(SelectedWeb.Fields, fc => fc.IncludeWithDefaultProperties(RetrievalExpressions));
+                    }
                     ClientContext.ExecuteQueryRetry();
                     if (!string.IsNullOrEmpty(Group))
                     {
-                        WriteObject(SelectedWeb.Fields.Where(f => f.Group.Equals(Group, StringComparison.InvariantCultureIgnoreCase)), true);
+                        if (InSiteHierarchy.IsPresent)
+                        {
+                            WriteObject(SelectedWeb.AvailableFields.Where(f => f.Group.Equals(Group, StringComparison.InvariantCultureIgnoreCase)).OrderBy(f => f.Title), true);
+                        }
+                        else
+                        {
+                            WriteObject(SelectedWeb.Fields.Where(f => f.Group.Equals(Group, StringComparison.InvariantCultureIgnoreCase)).OrderBy(f => f.Title), true);
+                        }
                     }
                     else
                     {
-                        WriteObject(SelectedWeb.Fields, true);
+                        if (InSiteHierarchy.IsPresent)
+                        {
+                            WriteObject(SelectedWeb.AvailableFields.OrderBy(f => f.Title), true);
+                        }
+                        else
+                        {
+                            WriteObject(SelectedWeb.Fields.OrderBy(f => f.Title), true);
+                        }
                     }
                 }
                 else
                 {
                     Field field = null;
                     if (Identity.Id != Guid.Empty)
                     {
-                        field = SelectedWeb.Fields.GetById(Identity.Id);
+                        if (InSiteHierarchy.IsPresent)
+                        {
+                            field = SelectedWeb.AvailableFields.GetById(Identity.Id);
+                        }
+                        else
+                        {
+                            field = SelectedWeb.Fields.GetById(Identity.Id);
+                        }
                     }
                     else if (!string.IsNullOrEmpty(Identity.Name))
                     {
-                        field = SelectedWeb.Fields.GetByInternalNameOrTitle(Identity.Name);
+                        if (InSiteHierarchy.IsPresent)
+                        {
+                            field = SelectedWeb.AvailableFields.GetByInternalNameOrTitle(Identity.Name);
+                        }
+                        else
+                        {
+                            field = SelectedWeb.Fields.GetByInternalNameOrTitle(Identity.Name);
+                        }
                     }
                     ClientContext.Load(field, RetrievalExpressions);
                     ClientContext.ExecuteQueryRetry();