ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-search-3-chars

Browse Source
This commit is contained in:
Ulf Gebhardt 2023-04-25 12:02:43 +02:00 committed by GitHub
commit bbe77c7ddd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
backend/src/schema/resolvers/posts.js
View File

@ -310,6 +310,7 @@ export default {
` `
MATCH (user:User {id: $userId}) WHERE user.role = 'admin' MATCH (user:User {id: $userId}) WHERE user.role = 'admin'
MATCH (post:Post {id: $params.id}) MATCH (post:Post {id: $params.id})
WHERE NOT((post)-[:IN]->(:Group))
MERGE (user)-[pinned:PINNED {createdAt: toString(datetime())}]->(post) MERGE (user)-[pinned:PINNED {createdAt: toString(datetime())}]->(post)
SET post.pinned = true SET post.pinned = true
RETURN post, pinned.createdAt as pinnedAt RETURN post, pinned.createdAt as pinnedAt
@ -322,10 +323,12 @@ export default {
})) }))
}) })
const [transactionResult] = await writeTxResultPromise const [transactionResult] = await writeTxResultPromise
const { pinnedPost, pinnedAt } = transactionResult if (transactionResult) {
pinnedPostWithNestedAttributes = { const { pinnedPost, pinnedAt } = transactionResult
...pinnedPost, pinnedPostWithNestedAttributes = {
pinnedAt, ...pinnedPost,
pinnedAt,
}
} }
} finally { } finally {
session.close() session.close()

2
webapp/components/ContentMenu/ContentMenu.vue
View File

@ -80,7 +80,7 @@ export default {
}) })
} }
if (this.isAdmin) { if (this.isAdmin && !this.resource.group) {
if (!this.resource.pinnedBy) { if (!this.resource.pinnedBy) {
routes.push({ routes.push({
label: this.$t(`post.menu.pin`), label: this.$t(`post.menu.pin`),