From a465bf5f472227f46af42ec26a22e381aec5d458 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Fri, 23 Mar 2018 11:39:06 +0100
Subject: [PATCH] Fix error display on edit config in admin

---
 .../edit-custom-config/edit-custom-config.component.html | 9 +++++++++
 server/initializers/checker.ts                           | 9 ++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
index 910d2af58..4a5ffb37c 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
+++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
@@ -57,6 +57,9 @@
         <option value="/videos/local">Local videos</option>
       </select>
     </div>
+    <div *ngIf="formErrors.instanceDefaultClientRoute" class="form-error">
+      {{ formErrors.instanceDefaultClientRoute }}
+    </div>
   </div>
 
   <div class="inner-form-title">Cache</div>
@@ -116,6 +119,9 @@
         </option>
       </select>
     </div>
+    <div *ngIf="formErrors.userVideoQuota" class="form-error">
+      {{ formErrors.userVideoQuota }}
+    </div>
   </div>
 
   <div class="inner-form-title">Transcoding</div>
@@ -138,6 +144,9 @@
           </option>
         </select>
       </div>
+      <div *ngIf="formErrors.transcodingThreads" class="form-error">
+        {{ formErrors.transcodingThreads }}
+      </div>
     </div>
 
     <div class="form-group" *ngFor="let resolution of resolutions">
diff --git a/server/initializers/checker.ts b/server/initializers/checker.ts
index e5cc1b7be..cd93f19a9 100644
--- a/server/initializers/checker.ts
+++ b/server/initializers/checker.ts
@@ -21,10 +21,13 @@ function checkMissedConfig () {
   const required = [ 'listen.port',
     'webserver.https', 'webserver.hostname', 'webserver.port',
     'database.hostname', 'database.port', 'database.suffix', 'database.username', 'database.password',
-    'storage.videos', 'storage.logs', 'storage.thumbnails', 'storage.previews', 'storage.torrents', 'storage.cache', 'log.level',
+    'redis.hostname', 'redis.port', 'redis.auth',
+    'smtp.hostname', 'smtp.port', 'smtp.username', 'smtp.password', 'smtp.tls', 'smtp.from_address',
+    'storage.avatars', 'storage.videos', 'storage.logs', 'storage.previews', 'storage.thumbnails', 'storage.torrents', 'storage.cache',
+    'log.level',
+    'user.video_quota',
     'cache.previews.size', 'admin.email', 'signup.enabled', 'signup.limit', 'transcoding.enabled', 'transcoding.threads',
-    'user.video_quota', 'smtp.hostname', 'smtp.port', 'smtp.username', 'smtp.password', 'smtp.tls', 'smtp.from_address',
-    'instance.name', 'instance.description', 'instance.terms'
+    'instance.name', 'instance.short_description', 'instance.description', 'instance.terms', 'instance.default_client_route'
   ]
   const miss: string[] = []
 
-- 
2.41.0