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
GitLab 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
3fa04183
Commit
3fa04183
authored
5 years ago
by
Benedikt Heinrichs
Browse files
Options
Downloads
Plain Diff
Merge branch 'Topic/232-userMgmt' into Sprint/20190829
parents
41ea14d2
5b688779
No related branches found
No related tags found
1 merge request
!14
Sprint/20190829
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/Project/Controllers/ProjectRoleController.cs
+1
-1
1 addition, 1 deletion
src/Project/Controllers/ProjectRoleController.cs
src/Project/ReturnObjects/UserObject.cs
+3
-5
3 additions, 5 deletions
src/Project/ReturnObjects/UserObject.cs
with
4 additions
and
6 deletions
src/Project/Controllers/ProjectRoleController.cs
+
1
−
1
View file @
3fa04183
...
@@ -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
),
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
else
...
...
This diff is collapsed.
Click to expand it.
src/Project/ReturnObjects/UserObject.cs
+
3
−
5
View file @
3fa04183
using
Coscine.ApiCommons.ReturnObjects
;
using
Coscine.ApiCommons.ReturnObjects
;
using
System
;
using
System
;
using
System.Collections.Generic
;
using
System.Linq
;
using
System.Text
;
using
System.Threading.Tasks
;
namespace
Coscine.Api.Project.ReturnObjects
namespace
Coscine.Api.Project.ReturnObjects
{
{
...
@@ -13,11 +9,13 @@ namespace Coscine.Api.Project.ReturnObjects
...
@@ -13,11 +9,13 @@ 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
EmailAddress
{
get
;
set
;
}
public
UserObject
(
Guid
id
,
string
displayName
)
public
UserObject
(
Guid
id
,
string
displayName
,
string
emailAddress
)
{
{
Id
=
id
;
Id
=
id
;
DisplayName
=
displayName
;
DisplayName
=
displayName
;
EmailAddress
=
emailAddress
;
}
}
}
}
}
}
This diff is collapsed.
Click to expand it.
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