yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes merge issues

Browse Source
This commit is contained in:
Shannon
2017-05-16 15:51:30 +10:00
parent bb436426a4
commit ffd63a9103
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web/Editors/UserController.cs
View File

@@ -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",

5
src/Umbraco.Web/Models/ContentEditing/UserDisplay.cs
View File

@@ -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)

2
src/Umbraco.Web/Models/Mapping/UserModelMapper.cs
View File

@@ -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)))