DebaucheryLibrarian/traxxx-web
1
1
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Added actors admin panel with bulk merge. Fixed merge failing if source and target actor have conflicting network profiles.

Browse Source
This commit is contained in:
DebaucheryLibrarian
2026-06-17 00:05:42 +02:00
parent 994908ef6a
commit 721eaa5d07
28 changed files with 548 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/web/actors.js
View File

@@ -180,7 +180,7 @@ export async function createActorApi(req, res) {
}
export async function mergeActorsApi(req, res) {
const result = await mergeActors(Number(req.params.targetActorId), Number(req.params.sourceActorId), req.user);
const result = await mergeActors(Number(req.params.targetActorId), req.params.sourceActorIds.split(',').map((actorId) => Number(actorId)), req.user);
res.send(result);
}
@@ -208,7 +208,7 @@ export const actorsRouter = Router();
actorsRouter.get('/api/actors', fetchActorsApi);
actorsRouter.post('/api/actors', createActorApi);
actorsRouter.post('/api/actors/:targetActorId/merge/:sourceActorId', mergeActorsApi);
actorsRouter.post('/api/actors/:targetActorId/merge/:sourceActorIds', mergeActorsApi);
actorsRouter.get('/api/revisions/actors', fetchActorRevisionsApi);
actorsRouter.get('/api/revisions/actors/:revisionId', fetchActorRevisionsApi);