Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
Project
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Coscine
backend
apis
Project
Commits
a28981f8
Commit
a28981f8
authored
5 years ago
by
Marcel Nellesen
Browse files
Options
Downloads
Patches
Plain Diff
Fix: Alter First and LastNames for the UserManagement (coscine/issues#436)
parent
eb457487
No related branches found
No related tags found
1 merge request
!28
Fix: Alter First and LastNames for the UserManagement
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/Project/Controllers/ProjectRoleController.cs
+2
-2
2 additions, 2 deletions
src/Project/Controllers/ProjectRoleController.cs
src/Project/ReturnObjects/UserObject.cs
+8
-1
8 additions, 1 deletion
src/Project/ReturnObjects/UserObject.cs
with
10 additions
and
3 deletions
src/Project/Controllers/ProjectRoleController.cs
+
2
−
2
View file @
a28981f8
...
@@ -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
&&
...
...
This diff is collapsed.
Click to expand it.
src/Project/ReturnObjects/UserObject.cs
+
8
−
1
View file @
a28981f8
...
@@ -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
;
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
Ghost User
@ghost
mentioned in commit
8f1cde13
·
5 years ago
mentioned in commit
8f1cde13
mentioned in commit 8f1cde134f75710e9e05286ec420f71fb9205630
Toggle commit list
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment