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

Merge branch 'Hotfix/2392-fixEmptyResult' into 'master'

Fix: Fix for empty orgs (coscine/issues#2392)

See merge request !143
parents bb157940 231222b0
Branches
Tags
2 merge requests!144Draft: Master,!143Fix: Fix for empty orgs (coscine/issues#2392)
...@@ -305,6 +305,11 @@ namespace Coscine.Api.Resources.Controllers ...@@ -305,6 +305,11 @@ namespace Coscine.Api.Resources.Controllers
{ {
var orgs = Util.OrganizationsHelper.GetOrganization(user); var orgs = Util.OrganizationsHelper.GetOrganization(user);
if (orgs?.Any() != true)
{
orgs = new List<string> { "*" };
}
if (!resourceType.Enabled.HasValue if (!resourceType.Enabled.HasValue
|| !resourceType.Enabled.Value || !resourceType.Enabled.Value
|| !orgs.SelectMany(x => ResourceTypeFactory || !orgs.SelectMany(x => ResourceTypeFactory
......
...@@ -43,6 +43,11 @@ namespace Coscine.Api.Resources.Controllers ...@@ -43,6 +43,11 @@ namespace Coscine.Api.Resources.Controllers
var orgs = Util.OrganizationsHelper.GetOrganization(user); var orgs = Util.OrganizationsHelper.GetOrganization(user);
if (orgs?.Any() != true)
{
orgs = new List<string> { "*" };
}
var listOfResources = orgs.SelectMany(x => ResourceTypeFactory var listOfResources = orgs.SelectMany(x => ResourceTypeFactory
.Instance .Instance
.GetSpecificResourceTypes(x) .GetSpecificResourceTypes(x)
...@@ -63,6 +68,11 @@ namespace Coscine.Api.Resources.Controllers ...@@ -63,6 +68,11 @@ namespace Coscine.Api.Resources.Controllers
var orgs = Util.OrganizationsHelper.GetOrganization(user).ToList(); var orgs = Util.OrganizationsHelper.GetOrganization(user).ToList();
if (orgs?.Any() != true)
{
orgs = new List<string> { "*" };
}
var listOfActiveResources = orgs.SelectMany(x => ResourceTypeFactory var listOfActiveResources = orgs.SelectMany(x => ResourceTypeFactory
.Instance .Instance
.GetSpecificResourceTypes(x, ResourceTypes.Base.ResourceTypeStatus.Active) .GetSpecificResourceTypes(x, ResourceTypes.Base.ResourceTypeStatus.Active)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment