Lista Città (prese dal server: pickup)

src/server/router/index_router.js

@@ -466,12 +466,12 @@ router.post('/pickup', authenticate, (req, res) => {
   const params = req.body;
   let mytable = getTableByTableName(params.table);
   // console.log('mytable', mytable);
-  if (!mytable || !shared_consts.TablePickup.includes(params.table)) {
+  if (!mytable) {
     console.log(`Table ${params.table} not found`);
     return res.status(400).send({});
   }
 
-  return mytable.executeQueryTable(req.user.idapp, params).then(ris => {
+  return mytable.executeQueryPickup(req.user.idapp, params).then(ris => {
     return res.send(ris);
 
   }).catch((e) => {
@@ -1335,8 +1335,10 @@ function load(req, res, version) {
     }
   }
   let askedfriends = []
+  let myuserextra = null;
   if (req.user) {
     // askedfriends = User.getAskedFriendsByUsername(idapp, req.user.username);
+    myuserextra = User.addExtraInfo(idapp, req.user);
   }
 
   return Promise.all([
@@ -1369,14 +1371,17 @@ function load(req, res, version) {
     subSkills,
     sectors,
     statusSkills,
-    cities]).then((arrdata) => {
+    cities,
+    myuserextra]).then((arrdata) => {
     // console.table(arrdata);
-    const myuser = req.user;
+    let myuser = req.user;
     if (myuser) {
       try {
-        myuser.password = '';
-        myuser._doc.calcstat = arrdata[13];
-        // myuser._doc.profile.asked_friends = arrdata[30];
+        myuser = arrdata[30];
+        if (myuser) {
+          myuser.password = '';
+          myuser._doc.calcstat = arrdata[13];
+        }
       } catch (e) {}
     }
     if (version < 91) {