depurating picto expression update

sails/src/api/controllers/PictoController.js

@@ -218,49 +218,37 @@ module.exports = {
   change_exp: function (req, res) {
   change_exp: function (req, res) {
     var params = req.params.all();
     var params = req.params.all();
 
 
-    if (params.lang && params.text) {
-      PictoExp.findOne({ id: params.picto, lang: params.lang }).then(function (pictoExpression) {
+    if (!params.lang || !params.text)
+      return res.badRequest();
+
+    PictoExp.findOne({ id: params.picto, lang: params.lang })
+    .then(function (pictoExpression) {
       if (!pictoExpression) {
       if (!pictoExpression) {
         Picto.findOne({ id: params.picto }).then(function (picto) {
         Picto.findOne({ id: params.picto }).then(function (picto) {
-            if (!picto) {
-              res.badRequest();
-              throw new Error('Picto not found');
-            }
+          if (!picto)
+            return res.badRequest('Error: Picto not found');
           PictoExp.create({
           PictoExp.create({
             lang: params.lang,
             lang: params.lang,
             text: params.text,
             text: params.text,
             picto: picto.id
             picto: picto.id
           }).then(function (newPictoExpression) {
           }).then(function (newPictoExpression) {
-              if (newPictoExpression) {
-                res.ok(newPictoExpression);
-              } else {
-                res.serverError();
-              }
-            })
-            .catch(function () {
-              res.serverError();
+            if (!newPictoExpression)
+              throw new Error("Could not create picto expression");
+            return res.ok(newPictoExpression);
           });
           });
-          })
-          .catch(function () {
-            res.serverError();
         });
         });
       } else {
       } else {
         pictoExpression.text = params.text;
         pictoExpression.text = params.text;
         pictoExpression.save(function (error) {
         pictoExpression.save(function (error) {
-            if (error) {
-              res.serverError();
-            } else {
-              res.ok(pictoExpression);
-            }
+          if (error)
+            throw new Error("Could not save expression");
+          return res.ok(pictoExpression);
         });
         });
       }
       }
     })
     })
-      .catch(function () {
-        res.serverError();
+    .catch(function (err) {
+      return res.serverError("Error from server: " + err);
     });
     });
-    } else {
-      res.badRequest();
-    }
   },
   },
 
 
   /**
   /**