From 49a73f813832ef6bbb504196ff330c1cd726204f Mon Sep 17 00:00:00 2001 From: Ilya Sulimanov Date: Thu, 29 Jun 2023 13:56:19 +0300 Subject: [PATCH] fix: getOrganization without pagination for global admin (#2028) * fix: getOrganization without pagination for global admin return only built-in org * fix gofumpt --- controllers/organization.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/controllers/organization.go b/controllers/organization.go index 6f5f14be..7454f106 100644 --- a/controllers/organization.go +++ b/controllers/organization.go @@ -38,8 +38,17 @@ func (c *ApiController) GetOrganizations() { sortField := c.Input().Get("sortField") sortOrder := c.Input().Get("sortOrder") + isGlobalAdmin := c.IsGlobalAdmin() if limit == "" || page == "" { - maskedOrganizations, err := object.GetMaskedOrganizations(object.GetOrganizations(owner, c.getCurrentUser().Owner)) + var maskedOrganizations []*object.Organization + var err error + + if isGlobalAdmin { + maskedOrganizations, err = object.GetMaskedOrganizations(object.GetOrganizations(owner)) + } else { + maskedOrganizations, err = object.GetMaskedOrganizations(object.GetOrganizations(owner, c.getCurrentUser().Owner)) + } + if err != nil { c.ResponseError(err.Error()) return @@ -48,7 +57,6 @@ func (c *ApiController) GetOrganizations() { c.Data["json"] = maskedOrganizations c.ServeJSON() } else { - isGlobalAdmin := c.IsGlobalAdmin() if !isGlobalAdmin { maskedOrganizations, err := object.GetMaskedOrganizations(object.GetOrganizations(owner, c.getCurrentUser().Owner)) if err != nil {