|
@@ -326,10 +326,11 @@ module.exports = function(crowi) {
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
// create tag and relations
|
|
// create tag and relations
|
|
|
- newTags.forEach(async(tag) => {
|
|
|
|
|
|
|
+ /* eslint-disable no-await-in-loop */
|
|
|
|
|
+ for (const tag of newTags) {
|
|
|
const setTag = await Tag.findOrCreate(tag);
|
|
const setTag = await Tag.findOrCreate(tag);
|
|
|
PageTagRelation.createIfNotExist(page._id, setTag._id);
|
|
PageTagRelation.createIfNotExist(page._id, setTag._id);
|
|
|
- });
|
|
|
|
|
|
|
+ }
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
@@ -1010,10 +1011,6 @@ module.exports = function(crowi) {
|
|
|
await validateAppliedScope(user, grant, grantUserGroupId);
|
|
await validateAppliedScope(user, grant, grantUserGroupId);
|
|
|
page.applyScope(user, grant, grantUserGroupId);
|
|
page.applyScope(user, grant, grantUserGroupId);
|
|
|
|
|
|
|
|
- if (pageTags != null) {
|
|
|
|
|
- page.updateTags(pageTags);
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
let savedPage = await page.save();
|
|
let savedPage = await page.save();
|
|
|
const newRevision = Revision.prepareRevision(savedPage, body, null, user, { format });
|
|
const newRevision = Revision.prepareRevision(savedPage, body, null, user, { format });
|
|
|
const revision = await pushRevision(savedPage, newRevision, user, grant, grantUserGroupId);
|
|
const revision = await pushRevision(savedPage, newRevision, user, grant, grantUserGroupId);
|
|
@@ -1021,6 +1018,10 @@ module.exports = function(crowi) {
|
|
|
.populate('revision')
|
|
.populate('revision')
|
|
|
.populate('creator');
|
|
.populate('creator');
|
|
|
|
|
|
|
|
|
|
+ if (pageTags != null) {
|
|
|
|
|
+ await page.updateTags(pageTags);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
if (socketClientId != null) {
|
|
if (socketClientId != null) {
|
|
|
pageEvent.emit('create', savedPage, user, socketClientId);
|
|
pageEvent.emit('create', savedPage, user, socketClientId);
|
|
|
}
|
|
}
|
|
@@ -1052,12 +1053,12 @@ module.exports = function(crowi) {
|
|
|
savedPage = await this.syncRevisionToHackmd(savedPage);
|
|
savedPage = await this.syncRevisionToHackmd(savedPage);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if (socketClientId != null) {
|
|
|
|
|
- pageEvent.emit('update', savedPage, user, socketClientId);
|
|
|
|
|
|
|
+ if (pageTags != null) {
|
|
|
|
|
+ await savedPage.updateTags(pageTags);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if (pageTags != null) {
|
|
|
|
|
- savedPage.updateTags(pageTags);
|
|
|
|
|
|
|
+ if (socketClientId != null) {
|
|
|
|
|
+ pageEvent.emit('update', savedPage, user, socketClientId);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
return savedPage;
|
|
return savedPage;
|