From ffd63a9103684ac696fb20171f19179dd40f6ef9 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 16 May 2017 15:51:30 +1000
Subject: [PATCH] fixes merge issues

---
 src/Umbraco.Web/Editors/UserController.cs            | 4 ++--
 src/Umbraco.Web/Models/ContentEditing/UserDisplay.cs | 5 +++--
 src/Umbraco.Web/Models/Mapping/UserModelMapper.cs    | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web/Editors/UserController.cs b/src/Umbraco.Web/Editors/UserController.cs
index 1cdb243742..b0da9a3f47 100644
--- a/src/Umbraco.Web/Editors/UserController.cs
+++ b/src/Umbraco.Web/Editors/UserController.cs
@@ -68,14 +68,14 @@ namespace Umbraco.Web.Editors
             var startId = 100 + ((pageNumber -1) * pageSize);
             var numUsers = pageSize;
             var users = new List<UserDisplay>();
-            var userTypes = Services.UserService.GetAllUserTypes().ToDictionary(x => x.Alias, x => x.Name);
+            var userTypes = Services.UserService.GetAllUserGroups().ToDictionary(x => x.Alias, x => x.Name);
             var cultures = Services.TextService.GetSupportedCultures().ToDictionary(x => x.Name, x => x.DisplayName);
             for (int i = 0; i < numUsers; i++)
             {
                 var display = new UserDisplay
                 {
                     Id = startId,
-                    UserType = "writer",
+                    //UserType = "writer",
                     AllowedSections = new[] {"content", "media"},
                     AvailableUserTypes = userTypes,
                     Email = "test" + startId + "@test.com",
diff --git a/src/Umbraco.Web/Models/ContentEditing/UserDisplay.cs b/src/Umbraco.Web/Models/ContentEditing/UserDisplay.cs
index d77d9d2019..76a480c80d 100644
--- a/src/Umbraco.Web/Models/ContentEditing/UserDisplay.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/UserDisplay.cs
@@ -21,8 +21,9 @@ namespace Umbraco.Web.Models.ContentEditing
         [DataMember(Name = "email", IsRequired = true)]
         public string Email { get; set; }
 
-        [DataMember(Name = "userType")]
-        public string UserType { get; set; }
+        //TODO: Should be user groups!
+        //[DataMember(Name = "userType")]
+        //public string UserType { get; set; }
 
         /// <summary>
         /// Gets the available user types (i.e. to populate a drop down)
diff --git a/src/Umbraco.Web/Models/Mapping/UserModelMapper.cs b/src/Umbraco.Web/Models/Mapping/UserModelMapper.cs
index f6cad9169d..ea634ac09a 100644
--- a/src/Umbraco.Web/Models/Mapping/UserModelMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/UserModelMapper.cs
@@ -18,7 +18,7 @@ namespace Umbraco.Web.Models.Mapping
         {
             config.CreateMap<IUser, UserDisplay>()
                 .ForMember(detail => detail.Id, opt => opt.MapFrom(user => user.Id))
-                .ForMember(detail => detail.UserType, opt => opt.MapFrom(user => user.UserType.Alias))
+                //.ForMember(detail => detail.UserType, opt => opt.MapFrom(user => user.UserType.Alias))
                 .ForMember(detail => detail.StartContentId, opt => opt.MapFrom(user => user.StartContentId))
                 .ForMember(detail => detail.StartMediaId, opt => opt.MapFrom(user => user.StartMediaId))
                 .ForMember(detail => detail.Culture, opt => opt.MapFrom(user => user.GetUserCulture(applicationContext.Services.TextService)))