Merge remote-tracking branch 'origin/stable'

# Conflicts:
#	src/services/ws.js
This commit is contained in:
zadam 2021-07-05 10:14:37 +02:00
commit da0670188b
4 changed files with 7 additions and 2 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -166,6 +166,7 @@ const editorConfig = {
'IncludeNote',
'CutToNote',
'Mathematics',
'AutoformatMath',
'indentBlockShortcutPlugin',
'removeFormatLinksPlugin'
],

View file

@ -79,6 +79,10 @@ function fillInAdditionalProperties(entityChange) {
// the exception is isDeleted - in that case becca doesn't contain such entity at all
// this would have to be handled separately
if (entityChange.isErased) {
return;
}
// fill in some extra data needed by the frontend
if (entityChange.entityName === 'attributes') {
entityChange.entity = sql.getRow(`SELECT * FROM attributes WHERE attributeId = ?`, [entityChange.entityId]);