fixed bug cannot create SpaceBar and Carousel widgets

thiennn · thiennn · commit 83dbf4cf4871 · 2018-02-22T23:54:56.000+07:00
diff --git a/src/Modules/SimplCommerce.Module.Cms/Controllers/CarouselWidgetApiController.cs b/src/Modules/SimplCommerce.Module.Cms/Controllers/CarouselWidgetApiController.cs
@@ -129,7 +129,8 @@ private CarouselWidgetForm ToCarouselWidgetFormModel(IFormCollection formCollect
             var model = new CarouselWidgetForm();
             model.Name = formCollection["name"];
             model.WidgetZoneId = int.Parse(formCollection["widgetZoneId"]);
-            model.DisplayOrder = int.Parse(formCollection["displayOrder"]);
+            int.TryParse(formCollection["displayOrder"], out int displayOrder);
+            model.DisplayOrder = displayOrder;
             if (DateTimeOffset.TryParse(formCollection["publishStart"], out DateTimeOffset publishStart))
             {
                 model.PublishStart = publishStart;
diff --git a/src/Modules/SimplCommerce.Module.Cms/Controllers/SpaceBarWidgetApiContorller.cs b/src/Modules/SimplCommerce.Module.Cms/Controllers/SpaceBarWidgetApiContorller.cs
@@ -66,7 +66,10 @@ public async Task<IActionResult> Post(IFormCollection formCollection)
             {
                 foreach (var item in model.Items)
                 {
-                    item.Image = await SaveFile(item.UploadImage);
+                    if(item.UploadImage != null)
+                    {
+                        item.Image = await SaveFile(item.UploadImage);
+                    }
                 }
 
                 var widgetInstance = new WidgetInstance
@@ -126,7 +129,8 @@ private SpaceBarWidgetForm ToSpaceBarWidgetFormModel(IFormCollection formCollect
             var model = new SpaceBarWidgetForm();
             model.Name = formCollection["name"];
             model.WidgetZoneId = int.Parse(formCollection["widgetZoneId"]);
-            model.DisplayOrder = int.Parse(formCollection["displayOrder"]);
+            int.TryParse(formCollection["displayOrder"], out int displayOrder);
+            model.DisplayOrder = displayOrder;
             if (DateTimeOffset.TryParse(formCollection["publishStart"], out DateTimeOffset publishStart))
             {
                 model.PublishStart = publishStart;

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,10 @@ public async Task<IActionResult> Post(IFormCollection formCollection)`
`66`	`66`	`{`
`67`	`67`	`foreach (var item in model.Items)`
`68`	`68`	`{`
`69`		`- item.Image = await SaveFile(item.UploadImage);`
	`69`	`+ if(item.UploadImage != null)`
	`70`	`+ {`
	`71`	`+ item.Image = await SaveFile(item.UploadImage);`
	`72`	`+ }`
`70`	`73`	`}`
`71`	`74`
`72`	`75`	`var widgetInstance = new WidgetInstance`
`@@ -126,7 +129,8 @@ private SpaceBarWidgetForm ToSpaceBarWidgetFormModel(IFormCollection formCollect`
`126`	`129`	`var model = new SpaceBarWidgetForm();`
`127`	`130`	`model.Name = formCollection["name"];`
`128`	`131`	`model.WidgetZoneId = int.Parse(formCollection["widgetZoneId"]);`
`129`		`- model.DisplayOrder = int.Parse(formCollection["displayOrder"]);`
	`132`	`+ int.TryParse(formCollection["displayOrder"], out int displayOrder);`
	`133`	`+ model.DisplayOrder = displayOrder;`
`130`	`134`	`if (DateTimeOffset.TryParse(formCollection["publishStart"], out DateTimeOffset publishStart))`
`131`	`135`	`{`
`132`	`136`	`model.PublishStart = publishStart;`