Attention une mise à jour du serveur va être effectuée le lundi 17 mai entre 13h et 13h30. Cette mise à jour va générer une interruption du service de quelques minutes.

Commit 171b1a95 authored by Robin Tissot's avatar Robin Tissot

Merge branch 'fix-compared-transcriptions' into 'develop'

Prevent current transcription update when picking compared transcriptions

Closes #332

See merge request !62
parents ca72577c 6be53630
......@@ -85,7 +85,6 @@ export const mutations = {
tr[transcription.transcription] = transcription
state.all[index] = { ...state.all[index], transcriptions: tr }
}
state.all[index] = { ...state.all[index], currentTrans: transcription }
// Force reference update on the whole array
// so that all components get a full refresh after an update
state.all = [...state.all]
......
......@@ -96,13 +96,16 @@ export const actions = {
async updateLineTranscriptionVersion({commit, dispatch, rootState}, {line, content}) {
commit('lines/updateTranscriptionVersion', { pk: line.pk, content: content }, {root: true})
const l = rootState.lines.all.find(li=>li.pk == line.pk)
let data = {
content: l.currentTrans.content,
line: l.currentTrans.line,
transcription: l.currentTrans.transcription
}
if (rootState.lines.editedLine) {
commit('lines/setEditedLine', l, {root: true})
}
if (l.currentTrans.pk) {
await dispatch('updateContent', {pk: l.currentTrans.pk, content: data, currentTransLine: l.currentTrans.line})
......@@ -115,6 +118,7 @@ export const actions = {
try {
const resp = await api.createContent(rootState.document.id, rootState.parts.pk, content)
commit('lines/setTranscriptions', { pk: currentTransLine, transcription: resp.data }, {root: true})
commit('lines/updateCurrentTrans', resp.data.transcription, {root: true})
} catch (err) {
console.log('couldnt create transcription!', err);
}
......@@ -124,6 +128,7 @@ export const actions = {
try {
const resp = await api.updateContent(rootState.document.id, rootState.parts.pk, pk, content)
commit('lines/setTranscriptions', { pk: currentTransLine, transcription: resp.data }, {root: true})
commit('lines/updateCurrentTrans', resp.data.transcription, {root: true})
} catch (err) {
console.log('couldnt update transcription!', err);
}
......
......@@ -162,7 +162,6 @@ import HelpVersions from './HelpVersions.vue';
import HelpCompareTranscriptions from './HelpCompareTranscriptions.vue';
export default Vue.extend({
props: ['line'],
components: {
LineVersion,
HelpVersions,
......@@ -196,6 +195,9 @@ export default Vue.extend({
}
},
computed: {
line () {
return this.$store.state.lines.editedLine
},
momentDate() {
return moment.tz(this.line.currentTrans.version_updated_at, this.timeZone);
},
......
......@@ -17,8 +17,7 @@
</div>
</div>
<TranscriptionModal v-if="$store.state.lines.editedLine"
v-bind:line="$store.state.lines.editedLine">
<TranscriptionModal v-if="$store.state.lines.editedLine">
</TranscriptionModal>
</div>
</template>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment