mirror of
https://github.com/Chocobozzz/PeerTube.git
synced 2024-11-29 20:14:02 -06:00
move videoQuota under a user object, use byte PipeTransform
This commit is contained in:
parent
fc27b17c6b
commit
1869c87535
@ -13,6 +13,14 @@
|
||||
<div class="section-title">Terms</div>
|
||||
|
||||
<div [innerHTML]="termsHTML"></div>
|
||||
|
||||
<div *ngIf="userVideoQuota !== -1;else noQuota">
|
||||
This instance provides a baseline quota of {{ userVideoQuota | bytes: 0 }} space for the videos of its users.
|
||||
</div>
|
||||
|
||||
<ng-template #noQuota>
|
||||
This instance provides unlimited space for the videos of its users.
|
||||
</ng-template>
|
||||
</div>
|
||||
|
||||
<div id="p2p-privacy">
|
||||
|
@ -23,6 +23,10 @@ export class AboutComponent implements OnInit {
|
||||
return this.serverService.getConfig().instance.name
|
||||
}
|
||||
|
||||
get userVideoQuota () {
|
||||
return this.serverService.getConfig().user.videoQuota
|
||||
}
|
||||
|
||||
ngOnInit () {
|
||||
this.serverService.getAbout()
|
||||
.subscribe(
|
||||
@ -31,7 +35,7 @@ export class AboutComponent implements OnInit {
|
||||
this.termsHTML = this.markdownService.textMarkdownToHTML(res.instance.terms)
|
||||
},
|
||||
|
||||
err => this.notificationsService.error('Error', err)
|
||||
err => this.notificationsService.error('Error getting about from server', err)
|
||||
)
|
||||
}
|
||||
|
||||
|
@ -5,6 +5,7 @@ import 'rxjs/add/operator/do'
|
||||
import { ReplaySubject } from 'rxjs/ReplaySubject'
|
||||
import { ServerConfig } from '../../../../../shared'
|
||||
import { About } from '../../../../../shared/models/server/about.model'
|
||||
import { ServerStats } from '../../../../../shared/models/server/server-stats.model'
|
||||
import { environment } from '../../../environments/environment'
|
||||
|
||||
@Injectable()
|
||||
@ -51,6 +52,9 @@ export class ServerService {
|
||||
file: {
|
||||
extensions: []
|
||||
}
|
||||
},
|
||||
user: {
|
||||
videoQuota: -1
|
||||
}
|
||||
}
|
||||
private videoCategories: Array<{ id: number, label: string }> = []
|
||||
|
@ -76,6 +76,9 @@ async function getConfig (req: express.Request, res: express.Response, next: exp
|
||||
file: {
|
||||
extensions: CONSTRAINTS_FIELDS.VIDEOS.EXTNAME
|
||||
}
|
||||
},
|
||||
user: {
|
||||
videoQuota: CONFIG.USER.VIDEO_QUOTA
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -39,4 +39,8 @@ export interface ServerConfig {
|
||||
extensions: string[]
|
||||
}
|
||||
}
|
||||
|
||||
user: {
|
||||
videoQuota: number
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user