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 /model/user.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 'model/user.go')
-rw-r--r-- | model/user.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/model/user.go b/model/user.go index 1a169f763..fdc519b99 100644 --- a/model/user.go +++ b/model/user.go @@ -13,7 +13,7 @@ import ( ) const ( - ROLE_ADMIN = "admin" + ROLE_TEAM_ADMIN = "admin" ROLE_SYSTEM_ADMIN = "system_admin" USER_AWAY_TIMEOUT = 5 * 60 * 1000 // 5 minutes USER_OFFLINE_TIMEOUT = 1 * 60 * 1000 // 1 minute @@ -289,7 +289,7 @@ func isValidRole(role string) bool { return true } - if role == ROLE_ADMIN { + if role == ROLE_TEAM_ADMIN { return true } |