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/config.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'app/config.go') diff --git a/app/config.go b/app/config.go index cb74bd1b3..34f4dc751 100644 --- a/app/config.go +++ b/app/config.go @@ -24,7 +24,7 @@ import ( ) const ( - ERROR_SERVICE_TERMS_NO_ROWS_FOUND = "store.sql_service_terms_store.get.no_rows.app_error" + ERROR_TERMS_OF_SERVICE_NO_ROWS_FOUND = "store.sql_terms_of_service_store.get.no_rows.app_error" ) func (a *App) Config() *model.Config { @@ -246,12 +246,12 @@ func (a *App) AsymmetricSigningKey() *ecdsa.PrivateKey { func (a *App) regenerateClientConfig() { a.clientConfig = utils.GenerateClientConfig(a.Config(), a.DiagnosticId(), a.License()) - if a.clientConfig["EnableCustomServiceTerms"] == "true" { - serviceTerms, err := a.GetLatestServiceTerms() + if a.clientConfig["EnableCustomTermsOfService"] == "true" { + termsOfService, err := a.GetLatestTermsOfService() if err != nil { mlog.Err(err) } else { - a.clientConfig["CustomServiceTermsId"] = serviceTerms.Id + a.clientConfig["CustomTermsOfServiceId"] = termsOfService.Id } } -- cgit v1.2.3-1-g7c22