diff options
author | Chocobozzz <me@florianbigard.com> | 2019-07-29 16:30:01 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2019-07-29 16:30:01 +0200 |
commit | 34dd7cb4ca4807e61a8c1d584b047c2cb383fe5a (patch) | |
tree | 64126e1a3cda0fb38a7deda59c397e6452eb4624 /client/src/app | |
parent | cd4cb177e6e35f69832304366c6f9df96600fb9e (diff) | |
download | PeerTube-34dd7cb4ca4807e61a8c1d584b047c2cb383fe5a.tar.gz PeerTube-34dd7cb4ca4807e61a8c1d584b047c2cb383fe5a.tar.zst PeerTube-34dd7cb4ca4807e61a8c1d584b047c2cb383fe5a.zip |
Fix quota in instance features table
Diffstat (limited to 'client/src/app')
-rw-r--r-- | client/src/app/shared/instance/instance-features-table.component.html | 2 | ||||
-rw-r--r-- | client/src/app/shared/instance/instance-features-table.component.ts | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/client/src/app/shared/instance/instance-features-table.component.html b/client/src/app/shared/instance/instance-features-table.component.html index 2885f97e3..2987bd00e 100644 --- a/client/src/app/shared/instance/instance-features-table.component.html +++ b/client/src/app/shared/instance/instance-features-table.component.html | |||
@@ -22,7 +22,7 @@ | |||
22 | <ng-container *ngIf="initialUserVideoQuota !== -1"> | 22 | <ng-container *ngIf="initialUserVideoQuota !== -1"> |
23 | {{ initialUserVideoQuota | bytes: 0 }} <ng-container *ngIf="dailyUserVideoQuota !== -1">({{ dailyUserVideoQuota | bytes: 0 }} per day)</ng-container> | 23 | {{ initialUserVideoQuota | bytes: 0 }} <ng-container *ngIf="dailyUserVideoQuota !== -1">({{ dailyUserVideoQuota | bytes: 0 }} per day)</ng-container> |
24 | 24 | ||
25 | <my-help helpType="custom" [customHtml]="quotaHelpIndication"></my-help> | 25 | <my-help tooltipPlacement="auto" helpType="custom" [customHtml]="quotaHelpIndication"></my-help> |
26 | </ng-container> | 26 | </ng-container> |
27 | 27 | ||
28 | <ng-container i18n *ngIf="initialUserVideoQuota === -1"> | 28 | <ng-container i18n *ngIf="initialUserVideoQuota === -1"> |
diff --git a/client/src/app/shared/instance/instance-features-table.component.ts b/client/src/app/shared/instance/instance-features-table.component.ts index 72e7c2730..a53082a93 100644 --- a/client/src/app/shared/instance/instance-features-table.component.ts +++ b/client/src/app/shared/instance/instance-features-table.component.ts | |||
@@ -22,7 +22,7 @@ export class InstanceFeaturesTableComponent implements OnInit { | |||
22 | } | 22 | } |
23 | 23 | ||
24 | get dailyUserVideoQuota () { | 24 | get dailyUserVideoQuota () { |
25 | return this.serverService.getConfig().user.videoQuotaDaily | 25 | return Math.min(this.initialUserVideoQuota, this.serverService.getConfig().user.videoQuotaDaily) |
26 | } | 26 | } |
27 | 27 | ||
28 | ngOnInit () { | 28 | ngOnInit () { |