1
0
mirror of https://github.com/mattermost/focalboard.git synced 2025-01-08 15:06:08 +02:00

update for older object model

This commit is contained in:
Scott Bishel 2023-08-17 11:00:23 -06:00
parent 110d9d4cfd
commit 85825cb6a3

View File

@ -9,6 +9,8 @@ import (
"github.com/mattermost/focalboard/server/model"
"github.com/mattermost/focalboard/server/services/audit"
"github.com/mattermost/focalboard/server/utils"
mmModel "github.com/mattermost/mattermost-server/v6/model"
)
func (a *API) registerUsersRoutes(r *mux.Router) {
@ -91,7 +93,7 @@ func (a *API) handleGetUsersList(w http.ResponseWriter, r *http.Request) {
ctx := r.Context()
session := ctx.Value(sessionContextKey).(*model.Session)
isSystemAdmin := a.permissions.HasPermissionTo(session.UserID, model.PermissionManageSystem)
isSystemAdmin := a.permissions.HasPermissionTo(session.UserID, mmModel.PermissionManageSystem)
for _, user := range users {
if user.ID == session.UserID {
@ -270,7 +272,7 @@ func (a *API) handleGetUser(w http.ResponseWriter, r *http.Request) {
if userID == session.UserID {
user.Sanitize(map[string]bool{})
} else {
a.app.SanitizeProfile(user, a.permissions.HasPermissionTo(session.UserID, model.PermissionManageSystem))
a.app.SanitizeProfile(user, a.permissions.HasPermissionTo(session.UserID, mmModel.PermissionManageSystem))
}
userData, err := json.Marshal(user)