- Fixing 16252: Add user exception when no email address entered

--HG--
branch : dev

src/Orchard.Tests.Modules/Users/Controllers/AdminControllerTests.cs

@@ -94,13 +94,12 @@ namespace Orchard.Tests.Modules.Users.Controllers {
             _authorizer.Setup(x => x.Authorize(It.IsAny<Permission>(), It.IsAny<LocalizedString>())).Returns(true);
 
             var controller = _container.Resolve<AdminController>();
-            controller.ValueProvider = Values.From(new {
+            var result = controller.CreatePOST(new UserCreateViewModel {
                 UserName = "four",
                 Email = "six@example.org",
                 Password = "five",
-                ConfirmPassword = "five",
+                ConfirmPassword = "five"
             });
-            var result = controller.CreatePOST();
             Assert.That(result, Is.TypeOf<RedirectToRouteResult>());
 
             var redirect = (RedirectToRouteResult)result;

src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs

@@ -57,12 +57,16 @@ namespace Orchard.Users.Controllers {
         }
 
         [HttpPost, ActionName("Create")]
-        public ActionResult CreatePOST() {
+        public ActionResult CreatePOST(UserCreateViewModel model) {
             if (!Services.Authorizer.Authorize(Permissions.ManageUsers, T("Not authorized to manage users")))
                 return new HttpUnauthorizedResult();
 
-            var model = new UserCreateViewModel();
-            UpdateModel(model);
+            var user = Services.ContentManager.New<IUser>(UserDriver.ContentType.Name);
+            model.User = Services.ContentManager.UpdateEditorModel(user, this);
+            if (!ModelState.IsValid) {
+                Services.TransactionManager.Cancel();
+                return View(model);
+            }
 
             string userExistsMessage = _userService.VerifyUserUnicity(model.UserName, model.Email);
             if (userExistsMessage != null) {
@@ -73,7 +77,7 @@ namespace Orchard.Users.Controllers {
                 AddModelError("ConfirmPassword", T("Password confirmation must match"));
             }
 
-            var user = _membershipService.CreateUser(new CreateUserParams(
+            user = _membershipService.CreateUser(new CreateUserParams(
                                                          model.UserName,
                                                          model.Password,
                                                          model.Email,

src/Orchard.Web/Modules/Orchard.Users/ViewModels/UserCreateViewModel.cs

@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using Orchard.Mvc.ViewModels;
 using Orchard.Security;