From 8d5a93c2659190c2bac67bb8e3210ff43c311c6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?=
 <skjnldsv@protonmail.com>
Date: Mon, 26 Oct 2020 10:50:11 +0100
Subject: [PATCH] Fix bulk contacts add to group
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
---
 src/views/Contacts.vue | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/views/Contacts.vue b/src/views/Contacts.vue
index f02da7c73..d28256dc7 100644
--- a/src/views/Contacts.vue
+++ b/src/views/Contacts.vue
@@ -190,13 +190,6 @@
 			<ImportView @close="closeImport" />
 		</Modal>
 
-		<!-- Select contacts group modal -->
-		<EntityPicker v-if="showContactPicker"
-			:data-types="pickerTypes"
-			:data-set="pickerData"
-			@close="onContactPickerClose"
-			@submit="onContactPickerPick" />
-
 		<!-- Bulk contacts edit modal -->
 		<Modal v-if="isProcessing || isProcessDone"
 			:clear-view-delay="-1"
@@ -204,6 +197,13 @@
 			@close="closeProcess">
 			<AddToGroupView v-bind="processStatus" @close="closeProcess" />
 		</Modal>
+
+		<!-- Select contacts group modal -->
+		<EntityPicker v-else-if="showContactPicker"
+			:data-types="pickerTypes"
+			:data-set="pickerData"
+			@close="onContactPickerClose"
+			@submit="onContactPickerPick" />
 	</Content>
 </template>
 
@@ -306,6 +306,7 @@ export default {
 			searchQuery: '',
 			showContactPicker: false,
 			contactPickerforGroup: null,
+			pickerData: [],
 			pickerTypes: [{
 				id: 'contact',
 				label: t('contacts', 'Contacts'),
@@ -718,6 +719,8 @@ export default {
 
 		// Bulk contacts group management handlers
 		addContactsToGroup(group) {
+			console.debug('Contacts picker opened for group', group)
+
 			// Get the full group if we provided the group name only
 			if (typeof group === 'string') {
 				group = this.groups.find(a => a.name === group)