interesting
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'release/4.3.0' into develop

This commit is contained in:
Chocobozzz 2022-09-28 10:03:32 +02:00
parent e76daa7301 690bad52e1
commit 49aa917509
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/app/+admin/follows/following-list/following-list.component.html
View File

@ -1,6 +1,6 @@
<h1> <h1>
<my-global-icon iconName="following" aria-hidden="true"></my-global-icon> <my-global-icon iconName="following" aria-hidden="true"></my-global-icon>
<ng-container i18n>Your instance subscriptions</ng-container> <ng-container i18n>Subscriptions of your instance</ng-container>
</h1> </h1>
<p-table <p-table

5
server/lib/video-state.ts
View File

@ -82,7 +82,10 @@ async function moveToExternalStorageState (options: {
if (pendingTranscode !== 0) return false if (pendingTranscode !== 0) return false
const previousVideoState = video.state const previousVideoState = video.state
await video.setNewState(VideoState.TO_MOVE_TO_EXTERNAL_STORAGE, isNewVideo, transaction)
if (video.state !== VideoState.TO_MOVE_TO_EXTERNAL_STORAGE) {
await video.setNewState(VideoState.TO_MOVE_TO_EXTERNAL_STORAGE, isNewVideo, transaction)
}
logger.info('Creating external storage move job for video %s.', video.uuid, { tags: [ video.uuid ] }) logger.info('Creating external storage move job for video %s.', video.uuid, { tags: [ video.uuid ] })