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 after source was created

Commits on Source 5

Update: added archived flag in createReturnObject function (coscine/issues#1597) · b827e05b
Sandra Westerhoff authored Jun 29, 2021 and Petar Hristov committed Jun 29, 2021

b827e05b
Merge branch 'Topic/1597-AddArchiveFlagInResourceObject' into 'Product/1573-ReadOnlyResources' · 64b0fbfe
Petar Hristov authored Jun 29, 2021
```
Topic/1597 add archive flag in resource object

See merge request !138
```
64b0fbfe
Merge branch 'Product/1573-ReadOnlyResources' into 'Sprint/2021-15' · fb096971
Petar Hristov authored Aug 13, 2021
```
Product/1573 ReadOnlyResources

See merge request !141
```
fb096971
Merge branch 'Sprint/2021-15' into 'master' · c7c79096
Petar Hristov authored Aug 13, 2021
```
Sprint/2021 15

See merge request !140
```
c7c79096

Chore: 2.5.0 · 9e15c001

CoscineBot authored Aug 13, 2021

# [2.5.0](v2.4.1...v2.5.0) (2021-08-13)

## Update
* added archived flag in createReturnObject function (coscine/issues#1597)

9e15c001

src/Database/Database.csproj

+1
−1

Original line number
Diff line number
Diff line

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

		<RootNamespace>Coscine.Database</RootNamespace>

		<AssemblyName>Coscine.Database</AssemblyName>

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

		<Version>2.4.1</Version>

		<Version>2.5.0</Version>

	</PropertyGroup>

	<PropertyGroup>

		<Authors>RWTH Aachen University</Authors>

src/Database/Models/ResourceModel.cs

+3
−2

Original line number
Diff line number
Diff line

@@ -443,7 +443,8 @@ namespace Coscine.Database.Models

                resourceTypeOptionObject == null ? new JObject() : JObject.FromObject(resourceTypeOptionObject),

                resource.ApplicationProfile,

                JToken.Parse(resource.FixedValues ?? "{}"),

                (resource.Creator != null) ? resource.Creator : null

                (resource.Creator != null) ? resource.Creator : null,

                (resource.Archived == "1") ? true : false

            );

        }

src/Database/ReturnObjects/ResourceObject.cs

+3
−1

Original line number
Diff line number
Diff line

@@ -24,8 +24,9 @@ namespace Coscine.Database.ReturnObjects

        public string ApplicationProfile { get; set; }

        public JToken FixedValues { get; set; }

        public Guid? Creator { get; set; }

        public bool Archived { get; set; }

        public ResourceObject(Guid id,  string displayName, string resourceName, string description, string keywords, string usageRights, ResourceTypeObject type, IEnumerable<DisciplineObject> disciplines, VisibilityObject visibility, LicenseObject license, JObject resourceTypeOption, string applicationProfile, JToken fixedValues, Guid? creator = null)

        public ResourceObject(Guid id,  string displayName, string resourceName, string description, string keywords, string usageRights, ResourceTypeObject type, IEnumerable<DisciplineObject> disciplines, VisibilityObject visibility, LicenseObject license, JObject resourceTypeOption, string applicationProfile, JToken fixedValues, Guid? creator = null, bool archived = false)

        {

            Id = id;

@@ -46,6 +47,7 @@ namespace Coscine.Database.ReturnObjects

            FixedValues = fixedValues;

            Creator = creator;

            Archived = archived;

        }

    }

}

Source

Target

Files