- CMyPopupEdit

- CMyEditor
 - MySkills

src/server/router/index_router.js

@@ -293,7 +293,7 @@ function getTableByTableName(tablename) {
     mytable = MySkill;
   else if (tablename === 'statusSkills')
     mytable = StatusSkill;
-  else if (tablename === 'citys')
+  else if (tablename === 'cities')
     mytable = City;
   else if (tablename === 'sectors')
     mytable = Sector;
@@ -1281,6 +1281,7 @@ function load(req, res, version) {
   let skills = Skill.findAllIdApp(idapp);
   let statusSkills = StatusSkill.findAllIdApp(idapp);
   let sectors = Sector.findAllIdApp(idapp);
+  let cities = City.findAllIdApp(idapp);
   let cart = null;
   let orderscart = null;
   if (sall) {
@@ -1301,7 +1302,7 @@ function load(req, res, version) {
 
 
   return Promise.all([bookedevent, eventlist, operators, wheres, contribtype, settings, permissions, disciplines, newstosent, mailinglist, mypage, gallery, paymenttype, calcstat, calzoom, producers, cart, storehouses, departments, orderscart, groups, resps, workers, internalpages,
-    levels, skills, sectors, statusSkills ])
+    levels, skills, sectors, statusSkills, cities ])
     .then((arrdata) => {
       // console.table(arrdata);
       const myuser = req.user;
@@ -1309,37 +1310,67 @@ function load(req, res, version) {
         myuser.password = '';
         myuser._doc.calcstat = arrdata[13];
       }
+      if (version < 91) {
+        res.send({
+          bookedevent: arrdata[0],
+          eventlist: arrdata[1],
+          operators: arrdata[2],
+          wheres: arrdata[3],
+          contribtype: arrdata[4],
+          settings: arrdata[5],
+          permissions: arrdata[6],
+          disciplines: arrdata[7],
+          newstosent: arrdata[8],
+          mailinglist: arrdata[9],
+          mypage: arrdata[10],
+          gallery: arrdata[11],
+          paymenttypes: arrdata[12],
+          calzoom: arrdata[14],
+          producers: arrdata[15],
+          cart: arrdata[16],
+          storehouses: arrdata[17],
+          departments: arrdata[18],
+          orders: arrdata[19],
+          groups: arrdata[20],
+          resps: arrdata[21],
+          workers: arrdata[22],
+          myuser,
+          internalpages: arrdata[23]
+        });
+      } else {
+          res.send({
+            bookedevent: arrdata[0],
+            eventlist: arrdata[1],
+            operators: arrdata[2],
+            wheres: arrdata[3],
+            contribtype: arrdata[4],
+            settings: arrdata[5],
+            permissions: arrdata[6],
+            disciplines: arrdata[7],
+            newstosent: arrdata[8],
+            mailinglist: arrdata[9],
+            mypage: arrdata[10],
+            gallery: arrdata[11],
+            paymenttypes: arrdata[12],
+            calzoom: arrdata[14],
+            producers: arrdata[15],
+            cart: arrdata[16],
+            storehouses: arrdata[17],
+            departments: arrdata[18],
+            orders: arrdata[19],
+            groups: arrdata[20],
+            resps: arrdata[21],
+            workers: arrdata[22],
+            myuser,
+            internalpages: arrdata[23],
+            levels: arrdata[24],
+            skills: arrdata[25],
+            sectors: arrdata[26],
+            statusSkills: arrdata[27],
+            cities: arrdata[28]
+          });
+      }
 
-      res.send({
-        bookedevent: arrdata[0],
-        eventlist: arrdata[1],
-        operators: arrdata[2],
-        wheres: arrdata[3],
-        contribtype: arrdata[4],
-        settings: arrdata[5],
-        permissions: arrdata[6],
-        disciplines: arrdata[7],
-        newstosent: arrdata[8],
-        mailinglist: arrdata[9],
-        mypage: arrdata[10],
-        gallery: arrdata[11],
-        paymenttypes: arrdata[12],
-        calzoom: arrdata[14],
-        producers: arrdata[15],
-        cart: arrdata[16],
-        storehouses: arrdata[17],
-        departments: arrdata[18],
-        orders: arrdata[19],
-        groups: arrdata[20],
-        resps: arrdata[21],
-        workers: arrdata[22],
-        myuser,
-        internalpages: arrdata[23],
-        levels: arrdata[24],
-        skills: arrdata[25],
-        sectors: arrdata[26],
-        statusSkills: arrdata[27],
-      });
     })
     .catch((e) => {
       console.log(e.message);
@@ -1464,7 +1495,7 @@ router.post('/upload_from_other_server/:dir', authenticate, (req, res) => {
 
 function uploadFile(req, res, version) {
   // console.log('/upload dir:' + dir);
-  const dir = req.params.dir;
+  const dir = tools.invertescapeslash(req.params.dir);
   const idapp = req.user.idapp;
 
   const form = new formidable.IncomingForm();
@@ -1473,7 +1504,11 @@ function uploadFile(req, res, version) {
 
   let dirmain = '/statics';
   if (version > 0) {
-    dirmain = '';
+    if (process.env.PROD === 1) {
+      dirmain = '';
+    } else {
+      dirmain = '/public';
+    }
   }
 
   form.uploadDir = folder + '/' + dir;
@@ -1532,7 +1567,7 @@ router.post('/upload/:dir', authenticate, (req, res) => {
 });
 
 
-router.post('/upload/:dir/:vers', authenticate, (req, res) => {
+router.post('/uploadnew/:vers/:dir/', authenticate, (req, res) => {
   let versionstr = req.params.vers;
   let version = tools.getVersionint(versionstr);