Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
P
Project
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Labels
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Environments
Analytics
Analytics
Code Review
Insights
Issue
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Coscine
B
backend
apis
Project
Commits
3fa04183
Commit
3fa04183
authored
Aug 29, 2019
by
Benedikt Heinrichs
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'Topic/232-userMgmt' into Sprint/20190829
parents
41ea14d2
5b688779
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
6 deletions
+4
-6
src/Project/Controllers/ProjectRoleController.cs
src/Project/Controllers/ProjectRoleController.cs
+1
-1
src/Project/ReturnObjects/UserObject.cs
src/Project/ReturnObjects/UserObject.cs
+3
-5
No files found.
src/Project/Controllers/ProjectRoleController.cs
View file @
3fa04183
...
...
@@ -49,7 +49,7 @@ namespace Coscine.Api.Project.Controllers
{
role
=
roleModel
.
GetById
(
projectRole
.
RoleId
);
}
return
new
ProjectRoleObject
(
projectRole
.
ProjectId
,
new
UserObject
(
userInst
.
Id
,
userInst
.
DisplayName
),
new
RoleObject
(
role
.
Id
,
role
.
DisplayName
));
return
new
ProjectRoleObject
(
projectRole
.
ProjectId
,
new
UserObject
(
userInst
.
Id
,
userInst
.
DisplayName
,
userInst
.
EmailAddress
),
new
RoleObject
(
role
.
Id
,
role
.
DisplayName
));
});
}
else
...
...
src/Project/ReturnObjects/UserObject.cs
View file @
3fa04183
using
Coscine.ApiCommons.ReturnObjects
;
using
System
;
using
System.Collections.Generic
;
using
System.Linq
;
using
System.Text
;
using
System.Threading.Tasks
;
namespace
Coscine.Api.Project.ReturnObjects
{
...
...
@@ -13,11 +9,13 @@ namespace Coscine.Api.Project.ReturnObjects
public
Guid
Id
{
get
;
set
;
}
public
string
DisplayName
{
get
;
set
;
}
public
string
EmailAddress
{
get
;
set
;
}
public
UserObject
(
Guid
id
,
string
displayName
)
public
UserObject
(
Guid
id
,
string
displayName
,
string
emailAddress
)
{
Id
=
id
;
DisplayName
=
displayName
;
EmailAddress
=
emailAddress
;
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment