Skip to content
Snippets Groups Projects
Commit 4ab45b8a authored by Petar Hristov's avatar Petar Hristov :speech_balloon:
Browse files

Merge branch 'dev' into 'master'

Release: Sprint/2022 22 :robot:

See merge request !185
parents 520b7c17 4d3a03ea
Branches
Tags
1 merge request!185Release: Sprint/2022 22 :robot:
......@@ -383,7 +383,7 @@ namespace Coscine.Database.Models
{
GitlabResourceTypeModel gitlabResourceTypeModel = new GitlabResourceTypeModel();
var gitlabResourceType = gitlabResourceTypeModel.GetById(resource.ResourceTypeOptionId.Value);
resourceTypeOptionObject = new GitlabResourceTypeObject(gitlabResourceType.Id, gitlabResourceType.Branch, gitlabResourceType.GitlabProjectId, gitlabResourceType.RepoUrl, gitlabResourceType.ProjectAccessToken);
resourceTypeOptionObject = new GitlabResourceTypeObject(gitlabResourceType.Id, gitlabResourceType.Branch, gitlabResourceType.GitlabProjectId, gitlabResourceType.RepoUrl, gitlabResourceType.ProjectAccessToken, gitlabResourceType.TosAccepted);
}
else if (resource.Type.Type == "linked" && resource.ResourceTypeOptionId != null)
{
......
......@@ -10,14 +10,16 @@ namespace Coscine.Database.ReturnObjects
public int ProjectId { get; set; }
public Uri RepoUrl { get; set; }
public string AccessToken { get; set; }
public bool TosAccepted { get; set; } = false;
public GitlabResourceTypeObject(Guid id, string branchName, int projectId, string repoUrl, string accessToken)
public GitlabResourceTypeObject(Guid id, string branchName, int projectId, string repoUrl, string accessToken, bool tosaccepted)
{
Id = id;
Branch = branchName;
ProjectId = projectId;
RepoUrl = new Uri(repoUrl);
AccessToken = accessToken;
TosAccepted = tosaccepted;
}
}
}
......@@ -14,5 +14,6 @@ namespace Coscine.Database.DataModel
public int GitlabProjectId { get; set; }
public string RepoUrl { get; set; }
public string ProjectAccessToken { get; set; }
public bool TosAccepted { get; set; }
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment