diff options
author | Chocobozzz <me@florianbigard.com> | 2018-03-23 11:39:06 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-03-23 11:39:06 +0100 |
commit | a465bf5f472227f46af42ec26a22e381aec5d458 (patch) | |
tree | d87746bd443c4a3f4699ee6e1a85a44dc6d6e7c6 | |
parent | 95540ed23a2e6ae6d48739f211aa24df57278413 (diff) | |
download | PeerTube-a465bf5f472227f46af42ec26a22e381aec5d458.tar.gz PeerTube-a465bf5f472227f46af42ec26a22e381aec5d458.tar.zst PeerTube-a465bf5f472227f46af42ec26a22e381aec5d458.zip |
Fix error display on edit config in admin
-rw-r--r-- | client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html | 9 | ||||
-rw-r--r-- | 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 @@ | |||
57 | <option value="/videos/local">Local videos</option> | 57 | <option value="/videos/local">Local videos</option> |
58 | </select> | 58 | </select> |
59 | </div> | 59 | </div> |
60 | <div *ngIf="formErrors.instanceDefaultClientRoute" class="form-error"> | ||
61 | {{ formErrors.instanceDefaultClientRoute }} | ||
62 | </div> | ||
60 | </div> | 63 | </div> |
61 | 64 | ||
62 | <div class="inner-form-title">Cache</div> | 65 | <div class="inner-form-title">Cache</div> |
@@ -116,6 +119,9 @@ | |||
116 | </option> | 119 | </option> |
117 | </select> | 120 | </select> |
118 | </div> | 121 | </div> |
122 | <div *ngIf="formErrors.userVideoQuota" class="form-error"> | ||
123 | {{ formErrors.userVideoQuota }} | ||
124 | </div> | ||
119 | </div> | 125 | </div> |
120 | 126 | ||
121 | <div class="inner-form-title">Transcoding</div> | 127 | <div class="inner-form-title">Transcoding</div> |
@@ -138,6 +144,9 @@ | |||
138 | </option> | 144 | </option> |
139 | </select> | 145 | </select> |
140 | </div> | 146 | </div> |
147 | <div *ngIf="formErrors.transcodingThreads" class="form-error"> | ||
148 | {{ formErrors.transcodingThreads }} | ||
149 | </div> | ||
141 | </div> | 150 | </div> |
142 | 151 | ||
143 | <div class="form-group" *ngFor="let resolution of resolutions"> | 152 | <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 () { | |||
21 | const required = [ 'listen.port', | 21 | const required = [ 'listen.port', |
22 | 'webserver.https', 'webserver.hostname', 'webserver.port', | 22 | 'webserver.https', 'webserver.hostname', 'webserver.port', |
23 | 'database.hostname', 'database.port', 'database.suffix', 'database.username', 'database.password', | 23 | 'database.hostname', 'database.port', 'database.suffix', 'database.username', 'database.password', |
24 | 'storage.videos', 'storage.logs', 'storage.thumbnails', 'storage.previews', 'storage.torrents', 'storage.cache', 'log.level', | 24 | 'redis.hostname', 'redis.port', 'redis.auth', |
25 | 'smtp.hostname', 'smtp.port', 'smtp.username', 'smtp.password', 'smtp.tls', 'smtp.from_address', | ||
26 | 'storage.avatars', 'storage.videos', 'storage.logs', 'storage.previews', 'storage.thumbnails', 'storage.torrents', 'storage.cache', | ||
27 | 'log.level', | ||
28 | 'user.video_quota', | ||
25 | 'cache.previews.size', 'admin.email', 'signup.enabled', 'signup.limit', 'transcoding.enabled', 'transcoding.threads', | 29 | 'cache.previews.size', 'admin.email', 'signup.enabled', 'signup.limit', 'transcoding.enabled', 'transcoding.threads', |
26 | 'user.video_quota', 'smtp.hostname', 'smtp.port', 'smtp.username', 'smtp.password', 'smtp.tls', 'smtp.from_address', | 30 | 'instance.name', 'instance.short_description', 'instance.description', 'instance.terms', 'instance.default_client_route' |
27 | 'instance.name', 'instance.description', 'instance.terms' | ||
28 | ] | 31 | ] |
29 | const miss: string[] = [] | 32 | const miss: string[] = [] |
30 | 33 | ||