fixing issue #336

sails/src/api/models/Student.js

@@ -337,13 +337,12 @@ module.exports = {
       // filter from the second list those found in the first list
       // filter from the second list those found in the first list
       var sups = so.filter(a => ss.findIndex(b => b.id == a.id) >= 0);
       var sups = so.filter(a => ss.findIndex(b => b.id == a.id) >= 0);
 
 
-      return $.when([sups, Supervisor.find(id_sup)])
-      .spread((sups, me) => {
-        // The requester is an office, so it has to be appended to the list of valid supervisors
-        sups.push(me[0]);
-        return sups;
-      })
-      .catch((err) => {throw err});
+      return ([sups, Supervisor.find(id_sup)]);
+    })
+    .spread((sups, me) => {
+      // The requester is an office, so it has to be appended to the list of valid supervisors
+      sups.push(me[0]);
+      return sups;
     })
     })
     .then((sups) => {return callback(null, sups)})
     .then((sups) => {return callback(null, sups)})
     .catch((err) => {return callback(err, [])});
     .catch((err) => {return callback(err, [])});