diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-09-14 16:59:24 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-09-14 16:59:24 -0700 |
| commit | 3bd350dcaf65a89040f7ea395a19b620819ba03e (patch) | |
| tree | 72b49e6fadfc1d513489b8938d5f73620ff2a6d8 /api/context.go | |
| parent | e06e292be71ca699d90bafbd635118aa47c2d7a5 (diff) | |
| parent | bfebb41bc0c0a1c5f481617f912bdf6dd483c341 (diff) | |
| download | chat-3bd350dcaf65a89040f7ea395a19b620819ba03e.tar.gz chat-3bd350dcaf65a89040f7ea395a19b620819ba03e.tar.bz2 chat-3bd350dcaf65a89040f7ea395a19b620819ba03e.zip | |
Merge branch 'master' into PLT-12-log
Diffstat (limited to 'api/context.go')
| -rw-r--r-- | api/context.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/api/context.go b/api/context.go index ea5677f95..fc7d8f23d 100644 --- a/api/context.go +++ b/api/context.go @@ -106,6 +106,9 @@ func (h handler) ServeHTTP(w http.ResponseWriter, r *http.Request) { if !h.isApi { w.Header().Set("X-Frame-Options", "DENY") w.Header().Set("Content-Security-Policy", "frame-ancestors none") + } else { + // All api response bodies will be JSON formatted + w.Header().Set("Content-Type", "application/json") } sessionId := "" @@ -308,7 +311,7 @@ func (c *Context) IsTeamAdmin(userId string) bool { return false } else { user := uresult.Data.(*model.User) - return model.IsInRole(c.Session.Roles, model.ROLE_ADMIN) && user.TeamId == c.Session.TeamId + return model.IsInRole(c.Session.Roles, model.ROLE_TEAM_ADMIN) && user.TeamId == c.Session.TeamId } } |