diff --git a/client/src/app/+admin/admin.module.ts b/client/src/app/+admin/admin.module.ts
index 366e29883..f01967ea6 100644
--- a/client/src/app/+admin/admin.module.ts
+++ b/client/src/app/+admin/admin.module.ts
@@ -49,6 +49,7 @@ import {
PluginSearchComponent,
PluginShowInstalledComponent
} from './plugins'
+import { SharedAdminModule } from './shared'
import { JobService, LogsComponent, LogsService } from './system'
import { DebugComponent, DebugService } from './system/debug'
import { JobsComponent } from './system/jobs/jobs.component'
@@ -69,6 +70,7 @@ import { JobsComponent } from './system/jobs/jobs.component'
SharedVideoMiniatureModule,
SharedTablesModule,
SharedUsersModule,
+ SharedAdminModule,
TableModule,
ChartModule
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 728185195..43f1438e0 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
@@ -218,10 +218,7 @@
[clearable]="false"
>
-
- Transcoding is enabled. The video quota only takes into account original video size.
- At most, a user could upload ~ {{ computeQuotaWithTranscoding() | bytes: 0 }}.
-
+
{{ formErrors.user.videoQuota }}
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 dc7802b2c..f7de4c7de 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
@@ -60,6 +60,10 @@ export class EditBasicConfigurationComponent implements OnInit, OnChanges {
return !!enabled.find((e: string) => e === algorithm)
}
+ getUserVideoQuota () {
+ return this.form.value['user']['videoQuota']
+ }
+
isSignupEnabled () {
return this.form.value['signup']['enabled'] === true
}
@@ -92,28 +96,6 @@ export class EditBasicConfigurationComponent implements OnInit, OnChanges {
return this.form.value['followings']['instance']['autoFollowIndex']['enabled'] === true
}
- computeQuotaWithTranscoding () {
- const transcodingConfig = this.serverConfig.transcoding
-
- const resolutions = transcodingConfig.enabledResolutions
- const higherResolution = VideoResolution.H_4K
- let multiplier = 0
-
- for (const resolution of resolutions) {
- multiplier += resolution / higherResolution
- }
-
- if (transcodingConfig.hls.enabled) multiplier *= 2
-
- return multiplier * parseInt(this.form.value['user']['videoQuota'], 10)
- }
-
- isTranscodingInformationDisplayed () {
- const formVideoQuota = parseInt(this.form.value['user']['videoQuota'], 10)
- return this.serverConfig.transcoding.enabledResolutions.length !== 0 &&
- formVideoQuota > 0
- }
-
buildLandingPageOptions () {
this.defaultLandingPageOptions = this.menuService.buildCommonLinks(this.serverConfig)
.links
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.scss b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.scss
index dda5d0b5e..764e626ec 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.scss
+++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.scss
@@ -150,3 +150,9 @@ ngb-tabset:not(.previews) ::ng-deep {
padding: 0 .3em;
}
}
+
+my-user-real-quota-info {
+ display: block;
+ margin-top: 5px;
+ font-size: 11px;
+}
diff --git a/client/src/app/+admin/overview/users/user-edit/user-edit.component.html b/client/src/app/+admin/overview/users/user-edit/user-edit.component.html
index e484ab8b0..da5879a36 100644
--- a/client/src/app/+admin/overview/users/user-edit/user-edit.component.html
+++ b/client/src/app/+admin/overview/users/user-edit/user-edit.component.html
@@ -152,10 +152,7 @@
[clearable]="false"
>
-
- Transcoding is enabled. The video quota only takes into account original video size.
- At most, this user could upload ~ {{ computeQuotaWithTranscoding() | bytes: 0 }}.
-
+