Changes to list loading

KeenMate · Mar 15, 2018 · 53f0d8f · 53f0d8f
1 parent 92df210
commit 53f0d8f
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/FluentlySharepoint/FluentlySharepoint/Extensions/List.cs b/FluentlySharepoint/FluentlySharepoint/Extensions/List.cs
@@ -13,7 +13,9 @@ public static class List
 		public static CSOMOperation LoadList(this CSOMOperation operation, string name, Action<ClientContext, Microsoft.SharePoint.Client.List> listLoader = null)
 		{
 			var web = operation.DecideWeb();
-			var list = web.Lists.First(l => l.Title == name);
+			var list = web.Lists.GetByTitle(name);
+
+			operation.LoadListRequired(list);
 
 			if (listLoader != null)
 				listLoader(operation.Context, list);
@@ -22,8 +24,6 @@ public static CSOMOperation LoadList(this CSOMOperation operation, string name,
 				operation.Context.Load(list);
 			}
 
-			operation.Context.Load(list, l=>l.Title);
-
 			operation.SetLevel(OperationLevels.List, list);
 			operation.ActionQueue.Enqueue(new DeferredAction { ClientObject = operation.LastList, Action = DeferredActions.Load });
 
@@ -44,7 +44,7 @@ public static CSOMOperation SelectList(this CSOMOperation operation, string name
 			return operation;
 		}
 
-		public static CSOMOperation ChangeColumn(this CSOMOperation operation, string columnName, FieldType? type = null, string displayName = null, bool? required = null, bool? uniqueValues = null)
+		public static CSOMOperation ModifyColumn(this CSOMOperation operation, string columnName, FieldType? type = null, string displayName = null, bool? required = null, bool? uniqueValues = null)
 		{
 			var field = operation.LastList.Fields.GetByInternalNameOrTitle(columnName);
 
@@ -87,7 +87,7 @@ public static ListItemCollection GetItems(this CSOMOperation operation, string q
 			if (rowLimit != null)
 				queryString = string.Format(CamlQueries.WrappedWithRowLimit, queryString, rowLimit);
 
-			var caml = new CamlQuery { ViewXml = queryString };
+			var caml = new CamlQuery { ViewXml = $"<View>{queryString}</View>" };
 
 			return operation.GetItems(caml);
 		}
@@ -161,7 +161,7 @@ public static CSOMOperation CreateList(this CSOMOperation operation, string name
 
 		public static CSOMOperation DeleteList(this CSOMOperation operation, string name)
 		{
-			var list = operation.LastWeb.Lists.First(l => l.Title == name);
+			var list = operation.LoadedLists[name];
 
 			operation.ActionQueue.Enqueue(new DeferredAction { ClientObject = list, Action = DeferredActions.Delete });