Nearing feature complete for driver auth

Web/ViewModels/User/EditUserViewModel.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Web.Mvc;
 using AutoMapper;
@@ -7,10 +6,16 @@ using MileageTraker.Web.Attributes;
 
 namespace MileageTraker.Web.ViewModels.User
 {
-	public class EditUserViewModel : RolesViewModel
+	public class EditUserViewModel
 	{
 		[HiddenInput(DisplayValue = false)]
-		public Guid UserId { get; set; } 
+		public Guid UserId { get; set; }
+
+		[Required]
+		[StringLength(128)]
+		[RegularExpression(@"[A-Za-z().]+(\s+[A-Za-z().]+)+", ErrorMessage = "Need complete name")]
+		[InputSize("medium")]
+		public string FullName { get; set; }
 
 		[Required]
 		[StringLength(64)]
@@ -23,11 +28,7 @@ namespace MileageTraker.Web.ViewModels.User
 		[InputSize("large")]
 		public string Email { get; set; }
 
-		[Required]
-		[StringLength(128)]
-		[RegularExpression(@"[A-Za-z().]+(\s+[A-Za-z().]+)+", ErrorMessage = "Need complete name")]
-		[InputSize("medium")]
-		public string FullName { get; set; }
+		public CheckBoxViewModel Roles { get; set; }
 
 		static EditUserViewModel()
 		{
@@ -46,9 +47,9 @@ namespace MileageTraker.Web.ViewModels.User
 
 		public void UpdateUser(Models.User user)
 		{
-			user.Username = this.Username;
-			user.FullName = this.FullName;
-			user.Email = this.Email;
+			user.Username = Username;
+			user.FullName = FullName;
+			user.Email = Email;
 		}
 	}
 }