Skip to content

Commit 6b78316

Browse files
committed
Primary is set before merging
1 parent 30c1f96 commit 6b78316

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

frontend/src/modules/member/pages/member-merge-suggestions-page.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,12 +240,12 @@ const mergeSuggestion = () => {
240240
return;
241241
}
242242
sendingMerge.value = true;
243-
primary.value = 0;
244243
MemberService.merge(
245244
membersToMerge.value.members[primary.value],
246245
membersToMerge.value.members[(primary.value + 1) % 2],
247246
)
248247
.then(() => {
248+
primary.value = 0;
249249
Message.success('Contacts merged successfuly');
250250
fetch();
251251
})

frontend/src/modules/organization/pages/organization-merge-suggestions-page.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,12 +241,12 @@ const mergeSuggestion = () => {
241241
return;
242242
}
243243
sendingMerge.value = true;
244-
primary.value = 0;
245244
OrganizationService.mergeOrganizations(
246245
organizationsToMerge.value.organizations[primary.value].id,
247246
organizationsToMerge.value.organizations[(primary.value + 1) % 2].id,
248247
)
249248
.then(() => {
249+
primary.value = 0;
250250
Message.success('Organizations merged successfuly');
251251
fetch();
252252
})

0 commit comments

Comments
 (0)