diff options
| author | George Goldberg <george@gberg.me> | 2018-06-01 12:49:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-01 12:49:02 +0100 |
| commit | 516a097e1ad588d860b374ef1d0eff202adb286b (patch) | |
| tree | c6ca77b0ddee05c5fd2b794f09580a65e672ccaf /store/sqlstore/team_store.go | |
| parent | 27e7841a734e9c3ed71f988a653f5865d2ef6f91 (diff) | |
| download | chat-516a097e1ad588d860b374ef1d0eff202adb286b.tar.gz chat-516a097e1ad588d860b374ef1d0eff202adb286b.tar.bz2 chat-516a097e1ad588d860b374ef1d0eff202adb286b.zip | |
MM-10757: Default roles from scheme should be keyed by name not ID. (#8894)
* MM-10757: Default roles from scheme should be keyed by name not ID.
* Update permissions import/export.
Diffstat (limited to 'store/sqlstore/team_store.go')
| -rw-r--r-- | store/sqlstore/team_store.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/store/sqlstore/team_store.go b/store/sqlstore/team_store.go index f8d76bba1..fe4c09175 100644 --- a/store/sqlstore/team_store.go +++ b/store/sqlstore/team_store.go @@ -440,8 +440,8 @@ func (s SqlTeamStore) AnalyticsTeamCount() store.StoreChannel { var TEAM_MEMBERS_WITH_SCHEME_SELECT_QUERY = ` SELECT TeamMembers.*, - TeamScheme.DefaultChannelUserRole TeamSchemeDefaultUserRole, - TeamScheme.DefaultChannelAdminRole TeamSchemeDefaultAdminRole + TeamScheme.DefaultTeamUserRole TeamSchemeDefaultUserRole, + TeamScheme.DefaultTeamAdminRole TeamSchemeDefaultAdminRole FROM TeamMembers LEFT JOIN |