diff options
| author | Harshil Sharma <harshil.sharma@joshtechnologygroup.com> | 2018-10-10 00:55:47 +0000 |
|---|---|---|
| committer | Jesse Hallam <jesse.hallam@gmail.com> | 2018-10-09 20:55:47 -0400 |
| commit | bffcccf99de8a8f3c68cff9e39d2847f0996b67b (patch) | |
| tree | 10bf45d87927dc792a233d0653d6ba273c9a7b28 /app/user.go | |
| parent | 59319b7915b8eb4c20a0d4878382cc0e41fc536d (diff) | |
| download | chat-bffcccf99de8a8f3c68cff9e39d2847f0996b67b.tar.gz chat-bffcccf99de8a8f3c68cff9e39d2847f0996b67b.tar.bz2 chat-bffcccf99de8a8f3c68cff9e39d2847f0996b67b.zip | |
Refactored to rename "service terms" to "terms of service" (#9581)
* #124 renamed identififers from service terms to terms of service
* #124 renamed identififers from service terms to terms of service
* 124 renamed ServiceTerms model to TermsOfService
* 124 Renamed EnableCustomServiceTerms feature flag to EnableCustomTermsOfService
* 124 Renamed EnableCustomServiceTerms feature flag to EnableCustomTermsOfService
* #124 fixed formatting
* #124 fixed formatting
* #132 renamed table ServiceTerms to TermsOfService
* #124 renamed some missed files from 'service_terms' to 'terms_of_service'
* #124 removed fixed TODOs
* drop migrate of ServiceTerms table, since backporting
* s/ServiceTerms/TermsOfService/ in tests
* s/AcceptedServiceTermsId/AcceptedTermsOfServiceId/
Change the model attribute, even though the column name will eventually be removed.
* s/accepted_service_terms_id/accepted_terms_of_service_id/ to match redux
* s/serviceTerms/termsOfService
* rename column too, and add max size constraint
* s/EnableCustomServiceTerms/EnableCustomTermsOfService
Diffstat (limited to 'app/user.go')
| -rw-r--r-- | app/user.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/user.go b/app/user.go index 1faf2b895..e565fea76 100644 --- a/app/user.go +++ b/app/user.go @@ -1652,16 +1652,16 @@ func (a *App) UpdateOAuthUserAttrs(userData io.Reader, user *model.User, provide return nil } -func (a *App) RecordUserServiceTermsAction(userId, serviceTermsId string, accepted bool) *model.AppError { +func (a *App) RecordUserTermsOfServiceAction(userId, termsOfServiceId string, accepted bool) *model.AppError { user, err := a.GetUser(userId) if err != nil { return err } if accepted { - user.AcceptedServiceTermsId = serviceTermsId + user.AcceptedTermsOfServiceId = termsOfServiceId } else { - user.AcceptedServiceTermsId = "" + user.AcceptedTermsOfServiceId = "" } _, err = a.UpdateUser(user, false) if err != nil { |