Merge pull request #2811 from compucorp/PCHR-4094-add-admin-in-the-ma…

…nagees-list

PCHR-4094: Add admin to leave request managees list

uk.co.compucorp.civicrm.hrleaveandabsences/js/src/leave-absences/shared/controllers/request.controller.js

@@ -814,6 +814,9 @@ define([
 
     /**
      * Loads the managees of currently logged in user
+     * If a contact is pre-selected, then a single managee is loaded.
+     * If user is an admin, then all contacts, including the admin, are loaded.
+     * If user is a manager, then only contacts they manage are loaded.
      *
      * @return {Promise}
      */
@@ -828,10 +831,7 @@ define([
         // In case of general administration
         return Contact.all()
           .then(function (contacts) {
-            vm.managedContacts = _.remove(contacts.list, function (contact) {
-              // Removes the admin from the list of contacts
-              return contact.id !== loggedInContact.id;
-            });
+            vm.managedContacts = contacts.list;
           });
       } else {
         // In any other case (including managing)

uk.co.compucorp.civicrm.hrleaveandabsences/js/test/shared/controllers/request.controller.spec.js

@@ -1132,7 +1132,7 @@
 
       describe('admin opens leave request popup in create mode', function () {
         var leaveRequest;
-        var adminId = '206';
+        var adminId = CRM.vars.leaveAndAbsences.contactId.toString();
 
         beforeEach(function () {
           leaveRequest = LeaveRequestInstance.init();
@@ -1151,8 +1151,8 @@
             expect(controller.isRole('admin')).toBeTruthy();
           });
 
-          it('does not contain admin in the list of managees', function () {
-            expect(_.find(controller.managedContacts, { 'id': adminId })).toBeUndefined();
+          it('contains admin in the list of managees', function () {
+            expect(!!_.find(controller.managedContacts, { 'id': adminId })).toBe(true);
           });
         });
       });