yuuza/outline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Misc fixes ported from #5814

Browse Source
This commit is contained in:
Tom Moor
2024-01-24 22:43:10 -05:00
parent df816c200f
commit cab9a1ec96
5 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/models/base/Model.ts
View File

@@ -44,6 +44,7 @@ export default abstract class Model {
if (!relations) {
return;
}
// this is to ensure that multiple loads don’t happen in parallel
if (this.loadingRelations) {
return this.loadingRelations;
}
@@ -64,8 +65,12 @@ export default abstract class Model {
promises.push(this.store.fetch(this.id, { force: true }));
}
this.loadingRelations = Promise.all(promises);
return await this.loadingRelations;
try {
this.loadingRelations = Promise.all(promises);
return await this.loadingRelations;
} finally {
this.loadingRelations = undefined;
}
}
/**