Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision

Target

Select target project
  • coscine/backend/libraries/database
1 result
Select Git revision
Show changes
Commits on Source (4)
......@@ -5,7 +5,7 @@
<RootNamespace>Coscine.Database.Actions</RootNamespace>
<AssemblyName>Coscine.Database.Actions</AssemblyName>
<TargetFramework>net6.0</TargetFramework>
<Version>2.16.2</Version>
<Version>2.17.0</Version>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Coscine.Database.Helpers" Version="2.*-*" />
......
......@@ -5,7 +5,7 @@
<AssemblyName>Coscine.Database.Tests</AssemblyName>
<TargetFrameworks>net6.0;net461</TargetFrameworks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<Version>2.16.2</Version>
<Version>2.17.0</Version>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Database\Database.csproj" />
......
......@@ -4,7 +4,7 @@
<RootNamespace>Coscine.Database</RootNamespace>
<AssemblyName>Coscine.Database</AssemblyName>
<TargetFrameworks>net6.0;net461</TargetFrameworks>
<Version>2.16.2</Version>
<Version>2.17.0</Version>
</PropertyGroup>
<PropertyGroup>
<Authors>RWTH Aachen University</Authors>
......
......@@ -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; }
}
}
......@@ -3,7 +3,7 @@
<RootNamespace>Coscine.Database</RootNamespace>
<AssemblyName>Coscine.Database.Scaffolding</AssemblyName>
<TargetFrameworks>net6.0;net461</TargetFrameworks>
<Version>2.16.2</Version>
<Version>2.17.0</Version>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Inflector.NetStandard" Version="1.2.2" />
......