Merge branch '108' of https://github.com/HBAI-Ltd/Toonflow-app into 108
This commit is contained in:
commit
c641cee831
@ -27,7 +27,7 @@ export default router.post(
|
||||
const assetsData = await u
|
||||
.db("o_assets")
|
||||
.leftJoin("o_image", "o_assets.imageId", "o_image.id")
|
||||
.select("o_assets.*", "o_image.filePath", "o_image.state")
|
||||
.select("o_assets.*", "o_image.filePath", "o_image.state", "o_image.errorReason")
|
||||
// @ts-ignore
|
||||
.where("o_assets.id", "in", assetIds)
|
||||
.whereNull("o_assets.assetsId")
|
||||
@ -35,7 +35,7 @@ export default router.post(
|
||||
let childAssetsData = await u
|
||||
.db("o_assets")
|
||||
.leftJoin("o_image", "o_assets.imageId", "o_image.id")
|
||||
.select("o_assets.*", "o_image.filePath", "o_image.state")
|
||||
.select("o_assets.*", "o_image.filePath", "o_image.state", "o_image.errorReason")
|
||||
.where("o_assets.projectId", projectId)
|
||||
// @ts-ignore
|
||||
.where("o_assets.id", "in", assetIds)
|
||||
@ -141,6 +141,8 @@ export default router.post(
|
||||
associateAssetsIds: assets2StoryboardMap[i.id!] ?? [],
|
||||
src: i.filePath,
|
||||
state: i.state,
|
||||
videoDesc: i.videoDesc,
|
||||
shouldGenerateImage: i.shouldGenerateImage,
|
||||
reason: i?.reason ?? "",
|
||||
}))
|
||||
.sort((a, b) => (a.index ?? 0) - (b.index ?? 0));
|
||||
|
||||
@ -14,7 +14,7 @@ export default router.post(
|
||||
videoDesc: z.string(),
|
||||
}),
|
||||
async (req, res) => {
|
||||
const { id, prompt } = req.body;
|
||||
const { id, prompt, videoDesc } = req.body;
|
||||
await u.db("o_storyboard").where({ id }).update({
|
||||
prompt,
|
||||
videoDesc,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user