]> git.immae.eu Git - github/Chocobozzz/PeerTube.git/commitdiff
Fix error display on edit config in admin
authorChocobozzz <me@florianbigard.com>
Fri, 23 Mar 2018 10:39:06 +0000 (11:39 +0100)
committerChocobozzz <me@florianbigard.com>
Fri, 23 Mar 2018 10:39:06 +0000 (11:39 +0100)
client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
server/initializers/checker.ts

index 910d2af5872be251b37cb4229ce05e457b528a8e..4a5ffb37cdb27e35703d2a45c824166053c0fa53 100644 (file)
@@ -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>
         </option>
       </select>
     </div>
+    <div *ngIf="formErrors.userVideoQuota" class="form-error">
+      {{ formErrors.userVideoQuota }}
+    </div>
   </div>
 
   <div class="inner-form-title">Transcoding</div>
           </option>
         </select>
       </div>
+      <div *ngIf="formErrors.transcodingThreads" class="form-error">
+        {{ formErrors.transcodingThreads }}
+      </div>
     </div>
 
     <div class="form-group" *ngFor="let resolution of resolutions">
index e5cc1b7be202544048ab5a4222174f79583089f7..cd93f19a94ad631c0efcb9ad25dc2d1fbd8fe94b 100644 (file)
@@ -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[] = []