From 32fd4d7f161a5b03141285e512c6773e4d2fa7e1 Mon Sep 17 00:00:00 2001 From: Nathaniel Allred Date: Fri, 25 Feb 2022 13:56:40 -0600 Subject: [PATCH] fix string constants (#19642) --- app/migrations.go | 2 +- app/onboarding.go | 6 +++--- model/system.go | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/migrations.go b/app/migrations.go index 53f4c5f56d..680687eb13 100644 --- a/app/migrations.go +++ b/app/migrations.go @@ -17,7 +17,7 @@ const GuestRolesCreationMigrationKey = "GuestRolesCreationMigrationComplete" const SystemConsoleRolesCreationMigrationKey = "SystemConsoleRolesCreationMigrationComplete" const ContentExtractionConfigDefaultTrueMigrationKey = "ContentExtractionConfigDefaultTrueMigrationComplete" const PlaybookRolesCreationMigrationKey = "PlaybookRolesCreationMigrationComplete" -const FirstAdminSetupCompleteKey = "FirstAdminSetupComplete" +const FirstAdminSetupCompleteKey = model.SystemFirstAdminSetupComplete // This function migrates the default built in roles from code/config to the database. func (a *App) DoAdvancedPermissionsMigration() { diff --git a/app/onboarding.go b/app/onboarding.go index 66a6f37bfc..d9ae28ebdc 100644 --- a/app/onboarding.go +++ b/app/onboarding.go @@ -56,7 +56,7 @@ func (a *App) CompleteOnboarding(c *request.Context, request *model.CompleteOnbo } firstAdminCompleteSetupObj := model.System{ - Name: model.SystemFirstAdminCompleteSetup, + Name: model.SystemFirstAdminSetupComplete, Value: "true", } @@ -68,13 +68,13 @@ func (a *App) CompleteOnboarding(c *request.Context, request *model.CompleteOnbo } func (a *App) GetOnboarding() (*model.System, *model.AppError) { - firstAdminCompleteSetupObj, err := a.Srv().Store.System().GetByName(model.SystemFirstAdminCompleteSetup) + firstAdminCompleteSetupObj, err := a.Srv().Store.System().GetByName(model.SystemFirstAdminSetupComplete) if err != nil { var nfErr *store.ErrNotFound switch { case errors.As(err, &nfErr): return &model.System{ - Name: model.SystemFirstAdminCompleteSetup, + Name: model.SystemFirstAdminSetupComplete, Value: "false", }, nil default: diff --git a/model/system.go b/model/system.go index 88b58d6e2b..b1b9ca1969 100644 --- a/model/system.go +++ b/model/system.go @@ -31,7 +31,7 @@ const ( SystemWarnMetricNumberOfPosts2m = "warn_metric_number_of_posts_2M" SystemWarnMetricLastRunTimestampKey = "LastWarnMetricRunTimestamp" SystemFirstAdminVisitMarketplace = "FirstAdminVisitMarketplace" - SystemFirstAdminCompleteSetup = "FirstAdminCompleteSetup" + SystemFirstAdminSetupComplete = "FirstAdminSetupComplete" AwsMeteringReportInterval = 1 AwsMeteringDimensionUsageHrs = "UsageHrs" UserLimitOverageCycleEndDate = "UserLimitOverageCycleEndDate"