Merge branch 'fix-enroll-expanded' of 'https://github.com/evamillan/grimoirelab-sortinghat'

Merges #791
Closes #791

Author: sduenas

releases/unreleased/add-org-to-individual.yml

@@ -0,0 +1,8 @@
+---
+title: ADD button doesn't affiliate individuals to organizations
+category: fixed
+author: Eva Millan <[email protected]>
+issue: null
+notes: >
+  Affiliating an individual to an organization using the "+ ADD" button on
+  the table expanded view failed.

ui/src/components/ExpandedIndividual.vue

@@ -13,7 +13,7 @@
       :enrollments="enrollments"
       :compact="compact"
       :is-locked="isLocked"
-      @openEnrollmentModal="$emit('openEnrollmentModal', uuid)"
+      @openEnrollmentModal="$emit('openEnrollmentModal')"
       @openTeamModal="
         $emit('openTeamModal', { uuid, organization: $event, enrollments })
       "

ui/src/components/IndividualsTable.vue

@@ -160,7 +160,7 @@
           @unmerge="unmerge($event)"
           @withdraw="removeAffiliation($event, item.uuid)"
           @updateEnrollment="updateEnrollmentDate"
-          @openEnrollmentModal="confirmEnroll"
+          @openEnrollmentModal="confirmEnroll(item, $event)"
           @openTeamModal="openTeamModal"
         />
       </template>

ui/src/views/Individual.vue

@@ -338,6 +338,7 @@
       :organization="teamModal.organization"
       :uuid="mk"
       :enroll="enroll"
+      :enrollments="individual.enrollments"
       @updateIndividual="updateIndividual($event)"
     />