Compare revisions

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

Source

Target

Show changes

Only incoming changes from source

Include changes to target since source was created

Commits on Source 10

Update: added new resource types (coscine/issues#1878) · eeccfa8d
Sandra Westerhoff authored Jan 18, 2022

eeccfa8d
Update: Extend resource type configuration for NRW FHs (coscine/issues#1877) · 254727c0
Hanna Führ authored Jan 19, 2022

254727c0
Merge branch 'Issue/1877-ExtendResourceTypeConfigurationNRWFHs' into 'dev' · 8c903ad4
Petar Hristov authored Jan 27, 2022
```
Issue/1877 extend resource type configuration nrwf hs

See merge request !152
```
8c903ad4
Merge branch 'Issue/1878-addNewResourceTypes' into 'dev' · e3a4c8f9
Petar Hristov authored Jan 27, 2022
```
Issue/1878 add new resource types

See merge request !151
```
e3a4c8f9
Update: Fixing resource type configuration for TUDo (coscine/issues#1866) · 125401db
Hanna Führ authored Jan 27, 2022 and Petar Hristov committed Jan 27, 2022

125401db
Merge branch 'Issue/1866-ExtendResourceTypeConfigurationTUDo' into 'dev' · 1529ca90
Petar Hristov authored Jan 27, 2022
```
Issue/1866 extend resource type configuration tu do

See merge request !155
```
1529ca90
Update: added new resource types (coscine/issues#1867) · 3e970954
Sandra Westerhoff authored Jan 28, 2022 and Petar Hristov committed Jan 28, 2022

3e970954
Merge branch 'Issue/1867-addNewResourceTypes' into 'dev' · 16155350
Petar Hristov authored Jan 28, 2022
```
Issue/1867 add new resource types

See merge request !153
```
16155350
Merge branch 'dev' into 'master' · 92721771
Petar Hristov authored Jan 31, 2022
```
Release: Sprint/2022-01

See merge request !156
```
92721771

Chore: 2.8.0 · 12d9c23d

CoscineBot authored Jan 31, 2022

# [2.8.0](v2.7.3...v2.8.0) (2022-01-31)

## Update
* added new resource types (coscine/issues#1867)
* Fixing resource type configuration for TUDo (coscine/issues#1866)
* Extend resource type configuration for NRW FHs (coscine/issues#1877)
* added new resource types (coscine/issues#1878)

12d9c23d

src/Database/Database.csproj

+1
−1

Original line number
Original line
Diff line number
Diff line

@@ -4,7 +4,7 @@

		<RootNamespace>Coscine.Database</RootNamespace>

		<RootNamespace>Coscine.Database</RootNamespace>

		<AssemblyName>Coscine.Database</AssemblyName>

		<AssemblyName>Coscine.Database</AssemblyName>

		<TargetFrameworks>net5.0;net461</TargetFrameworks>

		<TargetFrameworks>net5.0;net461</TargetFrameworks>

		<Version>2.7.3</Version>

		<Version>2.8.0</Version>

	</PropertyGroup>

	</PropertyGroup>

	<PropertyGroup>

	<PropertyGroup>

		<Authors>RWTH Aachen University</Authors>

		<Authors>RWTH Aachen University</Authors>

src/Database/Models/ResourceModel.cs

+9
−3

Original line number
Original line
Diff line number
Diff line

@@ -17,10 +17,16 @@ namespace Coscine.Database.Models

        private static readonly Dictionary<string, string> _configs = new Dictionary<string, string>

        private static readonly Dictionary<string, string> _configs = new Dictionary<string, string>

        {

        {

            // RDS-Web

            { "rds", "coscine/global/rds/ecs-rwth/rds" },

            { "rds", "coscine/global/rds/ecs-rwth/rds" },

            { "rdsude", "coscine/global/rds/ecs-ude/rds" },

            { "rdsude", "coscine/global/rds/ecs-ude/rds" },

            { "rdsnrw", "coscine/global/rds/ecs-nrw/rds" },

            { "rdstudo", "coscine/global/rds/ecs-tudo/rds" },

            // RDS-S3

            { "rdss3", "coscine/global/rds/ecs-rwth/rds-s3" },

            { "rdss3", "coscine/global/rds/ecs-rwth/rds-s3" },

            { "rdss3ude", "coscine/global/rds/ecs-ude/rds-s3" }

            { "rdss3ude", "coscine/global/rds/ecs-ude/rds-s3" },

            { "rdss3nrw", "coscine/global/rds/ecs-nrw/rds-s3" },

            { "rdss3tudo", "coscine/global/rds/ecs-tudo/rds-s3" }

        };

        };

        public Resource StoreFromObject(ResourceObject resourceObject)

        public Resource StoreFromObject(ResourceObject resourceObject)

@@ -551,12 +557,12 @@ namespace Coscine.Database.Models

        private bool IsLikeRds(string compare)

        private bool IsLikeRds(string compare)

        {

        {

            return compare == "rds" || compare == "rdsude";

            return compare == "rds" || compare == "rdsude" || compare == "rdsnrw" || compare == "rdstudo";

        }

        }

        private bool IsLikeRdsS3(string compare)

        private bool IsLikeRdsS3(string compare)

        {

        {

            return compare == "rdss3" || compare == "rdss3ude";

            return compare == "rdss3" || compare == "rdss3ude" || compare == "rdss3nrw" || compare == "rdss3tudo";

        }

        }

    }

    }

}

}

 No newline at end of file

Admin message

Source

Target

Files