issue #438 fixed

sails/src/api/controllers/StudentController.js

@@ -221,34 +221,30 @@ module.exports = {
   // Updates student information
   // Updates student information
   //
   //
   update: function (req, res) {
   update: function (req, res) {
+
     if (!req.params.id_stu) {
     if (!req.params.id_stu) {
-      return res.json(500, {
-        error: 'No student defined'
-      });
+      res.badRequest();
     }
     }
-    Student.findOne(req.params.id_stu)
-      .exec(function (err, stu) {
-        var k;
-        if (err || !stu)
-          return res.json(500, {
-            error: "No student found"
-          });
 
 
-        if (!req.body.password) {
-          delete req.body.password;
-        }
+    Student.findOne(req.params.id_stu).then(function(stu) {
+      var k;
 
 
-        // copy attributes
-        for (k in req.body) stu[k] = req.body[k];
-        stu.save(function (stuSaveError, saved) {
-          if (stuSaveError) {
-            return res.json(500, {
-              error: 'Error when saving student'
-            });
-          }
-          return res.json(stu);
-        });
+      // copy attributes
+      for (k in req.body) stu[k] = req.body[k];
+
+      if (!req.body.password) // to avoid change password when no one is provided
+        delete stu.password;
+
+      stu.save().then(function (saved) {
+        res.ok(stu);
+      })
+      .catch(function(err) {
+          res.severError();
       });
       });
+    })
+    .catch(function (err) {
+        res.notFound();
+    });
   },
   },
 
 
 
 

sails/src/api/models/Student.js

@@ -240,7 +240,10 @@ module.exports = {
   beforeUpdate: function (attrs, next) {
   beforeUpdate: function (attrs, next) {
     delete attrs.username;
     delete attrs.username;
     attrs.attributes = Student.getValidAttributes(attrs.attributes);
     attrs.attributes = Student.getValidAttributes(attrs.attributes);
-    attrs.password = bcrypt.hashSync(attrs.password, bcrypt.genSaltSync());
+    if (attrs.password) {
+      sails.log.debug('password changed');
+      attrs.password = bcrypt.hashSync(attrs.password, bcrypt.genSaltSync());
+    }
     next();
     next();
   },
   },