Skip to content
Snippets Groups Projects
Commit 72367be1 authored by Kimia Beheshti's avatar Kimia Beheshti
Browse files

Merge branch 'Issue/2155-ArchiveLinkedResource' into 'dev'

Update: Added check with new flags

See merge request !100
parents 7a9ecfaa 74176d65
No related branches found
No related tags found
2 merge requests!101Release: Sprint/2022 13 :robot:,!100Update: Added check with new flags
......@@ -139,8 +139,10 @@ namespace Coscine.Api.Resources.Controllers
LogAnalyticsEditResource(resource, _resourceModel.GetMetadataCompleteness(resourceObject), resourceObject.Disciplines, user);
var resourceTypeDefinition = ResourceTypeFactory.Instance.GetResourceType(resource);
if (resourceTypeDefinition.GetResourceTypeInformation().Result.CanUpdateResource)
{
resourceTypeDefinition.UpdateResource(id);
}
return Json(_resourceModel.UpdateByObject(resource, resourceObject));
}
else
......@@ -175,7 +177,10 @@ namespace Coscine.Api.Resources.Controllers
(_resourceModel.HasAccess(user, resource, UserRoles.Member) && resource.Creator.Equals(user.Id)))
{
var resourceTypeDefinition = ResourceTypeFactory.Instance.GetResourceType(resource);
if (resourceTypeDefinition.GetResourceTypeInformation().Result.CanSetResourceReadonly)
{
resourceTypeDefinition.SetResourceReadonly(id, status);
}
// update archived status of the resource
resource.Archived = status ? "1" : "0";
......@@ -221,8 +226,10 @@ namespace Coscine.Api.Resources.Controllers
LogAnalyticsDeleteResource(resource, _resourceModel.GetMetadataCompleteness(resourceObject), resourceObject.Disciplines, user);
var resourceTypeDefinition = ResourceTypeFactory.Instance.GetResourceType(resource);
if (resourceTypeDefinition.GetResourceTypeInformation().Result.CanDeleteResource)
{
resourceTypeDefinition.DeleteResource(id);
}
_emitter.EmitResourceDelete(new ResourceEventArgs(_configuration)
{
Resource = resource
......
......@@ -17,10 +17,10 @@
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Coscine.Action" Version="2.*-*" />
<PackageReference Include="Coscine.ApiCommons" Version="2.*-*" />
<PackageReference Include="Coscine.Database" Version="2.*-*" />
<PackageReference Include="Coscine.Logging" Version="2.*-*" />
<PackageReference Include="Coscine.ResourceTypes" Version="*-*" />
<PackageReference Include="Coscine.Action" Version="2.*" />
<PackageReference Include="Coscine.ApiCommons" Version="2.*" />
<PackageReference Include="Coscine.Database" Version="2.*" />
<PackageReference Include="Coscine.Logging" Version="2.*" />
<PackageReference Include="Coscine.ResourceTypes" Version="1.2.0-issue-2155-archi0014" />
</ItemGroup>
</Project>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment