summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2015-10-29 00:00:41 -0700
committer=Corey Hulen <corey@hulen.com>2015-10-29 00:00:41 -0700
commit6f599604c995271f9bee4a04722296a317617f9a (patch)
treef31b3d2e2a6e987f327577bf609dd02f08a5db11 /api
parent8e43a99581ae0cedf48e0756e0846ed74addb965 (diff)
downloadchat-6f599604c995271f9bee4a04722296a317617f9a.tar.gz
chat-6f599604c995271f9bee4a04722296a317617f9a.tar.bz2
chat-6f599604c995271f9bee4a04722296a317617f9a.zip
Fixing 200 error bug
Diffstat (limited to 'api')
-rw-r--r--api/context.go2
-rw-r--r--api/user.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/api/context.go b/api/context.go
index 9be3e85cc..a5d4169cb 100644
--- a/api/context.go
+++ b/api/context.go
@@ -320,7 +320,7 @@ func (c *Context) HasSystemAdminPermissions(where string) bool {
return true
}
- c.Err = model.NewAppError(where, "You do not have the appropriate permissions", "userId="+c.Session.UserId)
+ c.Err = model.NewAppError(where, "You do not have the appropriate permissions (system)", "userId="+c.Session.UserId)
c.Err.StatusCode = http.StatusForbidden
return false
}
diff --git a/api/user.go b/api/user.go
index c9958767f..732c6b9a8 100644
--- a/api/user.go
+++ b/api/user.go
@@ -653,7 +653,7 @@ func getProfiles(c *Context, w http.ResponseWriter, r *http.Request) {
options := utils.SanitizeOptions
options["passwordupdate"] = false
- if c.HasSystemAdminPermissions("getProfiles") {
+ if c.IsSystemAdmin() {
options["fullname"] = true
options["email"] = true
}