Skip to content

Commit

Permalink
Merge pull request #1883 from nextcloud/fix/bulk/contacts-group-add
Browse files Browse the repository at this point in the history
Fix bulk contacts add to group
  • Loading branch information
skjnldsv authored Nov 7, 2020
2 parents 8d3085c + 8d5a93c commit 23e887b
Showing 1 changed file with 10 additions and 7 deletions.
17 changes: 10 additions & 7 deletions src/views/Contacts.vue
Original file line number Diff line number Diff line change
Expand Up @@ -190,20 +190,20 @@
<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"
:can-close="isProcessDone"
@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>

Expand Down Expand Up @@ -306,6 +306,7 @@ export default {
searchQuery: '',
showContactPicker: false,
contactPickerforGroup: null,
pickerData: [],
pickerTypes: [{
id: 'contact',
label: t('contacts', 'Contacts'),
Expand Down Expand Up @@ -720,6 +721,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)
Expand Down

0 comments on commit 23e887b

Please sign in to comment.