Fixed search inputs not working in Firefox/Safari. Added Stashes and Alerts to header menu. Indexing compilation tags as assigned tags in Manticore.
This commit is contained in:
@@ -717,6 +717,12 @@ export async function mergeActors(targetActorId, sourceActorIds, reqUser) {
|
||||
.whereIn('actor_id', sourceActorIds)
|
||||
.returning('stash_id');
|
||||
|
||||
/* TODO: add revision entries
|
||||
console.log('SOURCES', targetActor, sourceActors);
|
||||
|
||||
throw new Error('ABORT');
|
||||
*/
|
||||
|
||||
await trx.commit();
|
||||
} catch (error) {
|
||||
await trx.rollback();
|
||||
|
||||
Reference in New Issue
Block a user