Fix setting theme in client

2 files changed, 4 insertions, 5 deletions

diff --git a/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html b/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html
index 315cd1749..7dfe5f5f9 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html
+++ b/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html
@@ -17,7 +17,7 @@
             <select formControlName="default" id="themeDefault" class="form-control">
               <option i18n value="default">{{ getDefaultThemeLabel() }}</option>
 
-              <option *ngFor="let theme of getAvailableThemes()" [value]="theme">{{ theme }}</option>
+              <option *ngFor="let theme of availableThemes" [value]="theme.id">{{ theme.label }}</option>
             </select>
           </div>
         </div>
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.ts
index f8f257671..56227d11c 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.ts
+++ b/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.ts
@@ -19,6 +19,7 @@ export class EditBasicConfigurationComponent implements OnInit, OnChanges {
 
   signupAlertMessage: string
   defaultLandingPageOptions: SelectOptionsItem[] = []
+  availableThemes: SelectOptionsItem[]
 
   constructor (
     private configService: ConfigService,
@@ -29,6 +30,8 @@ export class EditBasicConfigurationComponent implements OnInit, OnChanges {
   ngOnInit () {
     this.buildLandingPageOptions()
     this.checkSignupField()
+
+    this.availableThemes = this.themeService.buildAvailableThemes()
   }
 
   ngOnChanges (changes: SimpleChanges) {
@@ -49,10 +52,6 @@ export class EditBasicConfigurationComponent implements OnInit, OnChanges {
     return this.configService.videoQuotaDailyOptions
   }
 
-  getAvailableThemes () {
-    return this.themeService.getAvailableThemeLabels()
-  }
-
   doesTrendingVideosAlgorithmsEnabledInclude (algorithm: string) {
     const enabled = this.form.value['trending']['videos']['algorithms']['enabled']
     if (!Array.isArray(enabled)) return false