From af275fe9242303581192258ef4f6457fa45a58e4 Mon Sep 17 00:00:00 2001 From: Harshil Sharma Date: Wed, 26 Sep 2018 20:49:22 +0000 Subject: #MM-12130 changes for custom service terms (#9450) * #MM-12130 changes for custom service terms * Fixed styling * Added getServiceTerms API * removed unnecessary panic * removed custom service terms text from flat config * reverted user sql store as those changes are no longer needed * added tests * Updated a config key to be more standard * Added copyright info * Loading service terms only if the feature is enabled * Loading service terms only if the feature is enabled * removed unused index * added createservice termns API * made a param to bool instead of string * added createservice termns API * review fixes * fixed styling * Minor refactoring * removed saveConfig and loadConfig magic * added empty service terms text check to createServiceTerms API * refactoed some urls to be terms_of_service instead of service_terms * removed check for support settings * changed URLs in tests * removed unused code * fixed a bug * added service termd id in conif * fixed a test * review fixes * minor fixes * Fixed TestCreateServiceTerms --- web/web_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'web') diff --git a/web/web_test.go b/web/web_test.go index 4befa8e37..9f152b7cc 100644 --- a/web/web_test.go +++ b/web/web_test.go @@ -37,13 +37,13 @@ func StopTestStore() { } type TestHelper struct { - App *app.App + App *app.App - BasicUser *model.User - BasicChannel *model.Channel - BasicTeam *model.Team + BasicUser *model.User + BasicChannel *model.Channel + BasicTeam *model.Team - SystemAdminUser *model.User + SystemAdminUser *model.User } func Setup() *TestHelper { -- cgit v1.2.3-1-g7c22