fix: getOrganization without pagination for global admin (#2028)

* fix: getOrganization without pagination for global admin return only built-in org

* fix gofumpt
This commit is contained in:
Ilya Sulimanov
2023-06-29 13:56:19 +03:00
committed by GitHub
parent 55784c68a3
commit 49a73f8138

View File

@ -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 {