From bffcccf99de8a8f3c68cff9e39d2847f0996b67b Mon Sep 17 00:00:00 2001 From: Harshil Sharma Date: Wed, 10 Oct 2018 00:55:47 +0000 Subject: 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 --- app/user.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'app/user.go') 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 { -- cgit v1.2.3-1-g7c22