Skip to content
Snippets Groups Projects
Commit a28981f8 authored by Marcel Nellesen's avatar Marcel Nellesen
Browse files

Fix: Alter First and LastNames for the UserManagement (coscine/issues#436)

parent eb457487
No related branches found
No related tags found
1 merge request!28Fix: Alter First and LastNames for the UserManagement
...@@ -49,7 +49,7 @@ namespace Coscine.Api.Project.Controllers ...@@ -49,7 +49,7 @@ namespace Coscine.Api.Project.Controllers
{ {
role = roleModel.GetById(projectRole.RoleId); role = roleModel.GetById(projectRole.RoleId);
} }
return new ProjectRoleObject(projectRole.ProjectId, new UserObject(userInst.Id, userInst.DisplayName, userInst.EmailAddress), new RoleObject(role.Id, role.DisplayName)); return new ProjectRoleObject(projectRole.ProjectId, new UserObject(userInst.Id, userInst.DisplayName, userInst.Givenname, userInst.Surname, userInst.EmailAddress), new RoleObject(role.Id, role.DisplayName));
}); });
} }
else else
...@@ -67,7 +67,7 @@ namespace Coscine.Api.Project.Controllers ...@@ -67,7 +67,7 @@ namespace Coscine.Api.Project.Controllers
{ {
RoleModel roleModel = new RoleModel(); RoleModel roleModel = new RoleModel();
Guid.TryParse(projectId, out Guid projectIdGuid); Guid.TryParse(projectId, out Guid projectIdGuid);
UserObject userObject = new UserObject(user.Id, user.DisplayName, user.EmailAddress); UserObject userObject = new UserObject(user.Id, user.DisplayName, user.Givenname, user.Surname, user.EmailAddress);
return _projectRoleModel.GetAllWhere((projectRole) => return _projectRoleModel.GetAllWhere((projectRole) =>
(projectRole.UserId == user.Id && (projectRole.UserId == user.Id &&
......
...@@ -9,12 +9,19 @@ namespace Coscine.Api.Project.ReturnObjects ...@@ -9,12 +9,19 @@ namespace Coscine.Api.Project.ReturnObjects
public Guid Id { get; set; } public Guid Id { get; set; }
public string DisplayName { get; set; } public string DisplayName { get; set; }
public string Givenname { get; set; }
public string Surname { get; set; }
public string EmailAddress { get; set; } public string EmailAddress { get; set; }
public UserObject(Guid id, string displayName, string emailAddress) public UserObject(Guid id, string displayName, string givenname, string surname, string emailAddress)
{ {
Id = id; Id = id;
DisplayName = displayName; DisplayName = displayName;
Givenname = givenname;
Surname = surname;
EmailAddress = emailAddress; EmailAddress = emailAddress;
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment