mantra/mantra.press
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix for functions with entityId

Browse Source
This commit is contained in:
Kgothatso Ngako
2022-01-05 23:42:59 +02:00
parent 7be5200094
commit e728f7c8b8
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
server/router/fork/index.js
View File

@@ -15,7 +15,8 @@ module.exports = function (options) {
artifactVersionId: translationArtifactVersion.artifactVersionId, artifactVersionId: translationArtifactVersion.artifactVersionId,
userId: request.user.id, userId: request.user.id,
dialectId: translationArtifactVersion.dialectId, dialectId: translationArtifactVersion.dialectId,
forkedFromId: translationArtifactVersion.id forkedFromId: translationArtifactVersion.id,
entityId: request.user.individualEntityUser.entityUser.entityId
}) })
if (forkedTranslationArtifactVersion) { if (forkedTranslationArtifactVersion) {
return response.redirect(`/v/${forkedTranslationArtifactVersion.artifactVersionId}/translations/${forkedTranslationArtifactVersion.id}`) return response.redirect(`/v/${forkedTranslationArtifactVersion.artifactVersionId}/translations/${forkedTranslationArtifactVersion.id}`)
@@ -80,7 +81,12 @@ module.exports = function (options) {
}) })
if (artifactVersion) { if (artifactVersion) {
const forkedTranslationArtifactVersion = await forkArtifactVersion(artifactVersion, dialect, request.user.id) const forkedTranslationArtifactVersion = await forkArtifactVersion(
artifactVersion,
dialect,
request.user.id,
request.user.individualEntityUser.entityUser.entityId
)
if (forkedTranslationArtifactVersion) { if (forkedTranslationArtifactVersion) {
return response.redirect(`/v/${forkedTranslationArtifactVersion.artifactVersionId}/translations/${forkedTranslationArtifactVersion.id}`) return response.redirect(`/v/${forkedTranslationArtifactVersion.artifactVersionId}/translations/${forkedTranslationArtifactVersion.id}`)
} }
@@ -90,7 +96,7 @@ module.exports = function (options) {
next() next()
}) })
const forkArtifactVersion = (artifactVersion, dialect, userId) => { const forkArtifactVersion = (artifactVersion, dialect, userId, entityId) => {
if (artifactVersion.translationArtifactVersions.length == 0) { if (artifactVersion.translationArtifactVersions.length == 0) {
// create a translationArtifactVersion with a new dialect... // create a translationArtifactVersion with a new dialect...
return db.TranslationArtifactVersion.create({ return db.TranslationArtifactVersion.create({
@@ -98,6 +104,7 @@ module.exports = function (options) {
artifactVersionId: artifactVersion.id, artifactVersionId: artifactVersion.id,
dialectId: dialect.id, dialectId: dialect.id,
userId: userId, userId: userId,
entityId: entityId
}) })
} else { } else {
return db.TranslationArtifactVersion.create({ return db.TranslationArtifactVersion.create({