|
|
|
@ -236,18 +236,16 @@ func PublicizeMember(ctx *context.APIContext) { |
|
|
|
|
if ctx.Written() { |
|
|
|
|
return |
|
|
|
|
} |
|
|
|
|
allowed := userToPublicize.ID != ctx.Doer.ID && !ctx.Doer.IsAdmin |
|
|
|
|
if !allowed { |
|
|
|
|
if userToPublicize.ID != ctx.Doer.ID && !ctx.Doer.IsAdmin { |
|
|
|
|
isOwner, err := ctx.Org.Organization.IsOwnedBy(ctx, ctx.Doer.ID) |
|
|
|
|
if err != nil { |
|
|
|
|
ctx.Error(http.StatusInternalServerError, "ChangeOrgUserStatus", err) |
|
|
|
|
return |
|
|
|
|
} |
|
|
|
|
allowed = isOwner |
|
|
|
|
} |
|
|
|
|
if !allowed { |
|
|
|
|
ctx.Error(http.StatusForbidden, "", "Cannot publicize another member") |
|
|
|
|
return |
|
|
|
|
if !isOwner { |
|
|
|
|
ctx.Error(http.StatusForbidden, "", "Cannot publicize another member") |
|
|
|
|
return |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
err := organization.ChangeOrgUserStatus(ctx, ctx.Org.Organization.ID, userToPublicize.ID, true) |
|
|
|
|
if err != nil { |
|
|
|
@ -287,18 +285,16 @@ func ConcealMember(ctx *context.APIContext) { |
|
|
|
|
if ctx.Written() { |
|
|
|
|
return |
|
|
|
|
} |
|
|
|
|
allowed := userToConceal.ID != ctx.Doer.ID && !ctx.Doer.IsAdmin |
|
|
|
|
if !allowed { |
|
|
|
|
if userToConceal.ID != ctx.Doer.ID && !ctx.Doer.IsAdmin { |
|
|
|
|
isOwner, err := ctx.Org.Organization.IsOwnedBy(ctx, ctx.Doer.ID) |
|
|
|
|
if err != nil { |
|
|
|
|
ctx.Error(http.StatusInternalServerError, "ChangeOrgUserStatus", err) |
|
|
|
|
return |
|
|
|
|
} |
|
|
|
|
allowed = isOwner |
|
|
|
|
} |
|
|
|
|
if !allowed { |
|
|
|
|
ctx.Error(http.StatusForbidden, "", "Cannot conceal another member") |
|
|
|
|
return |
|
|
|
|
if !isOwner { |
|
|
|
|
ctx.Error(http.StatusForbidden, "", "Cannot conceal another member") |
|
|
|
|
return |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
err := organization.ChangeOrgUserStatus(ctx, ctx.Org.Organization.ID, userToConceal.ID, false) |
|
|
|
|
if err != nil { |
|
|
|
|