Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into fernando_branch

sails/src/api/controllers/PictoController.js

@@ -188,15 +188,15 @@ module.exports = {
 		var params = req.params.all();
 		var params = req.params.all();
 
 
 		if (!params.id) {
 		if (!params.id) {
-			res.badRequest();
-		} else {
-		    Picto.update({ id: params.id }, { owner: null}).then(function (updated) {
-			       res.ok(updated[0]);
-		    })
-        .catch(function() {
-          res.serverError();
-        });
-    }
+			return res.badRequest();
+
+    Picto.update({ id: params.id }, { owner: null })
+    .then(function (updated) {
+	      return res.ok(updated[0]);
+    })
+    .catch(function(err) {
+      return res.serverError("Error: " + err);
+    });
 	},
 	},
 
 
   /**
   /**

sails/src/api/controllers/SupervisorController.js

@@ -136,7 +136,7 @@ module.exports = {
         supervisor.active = true;
         supervisor.active = true;
         delete supervisor.password;
         delete supervisor.password;
         supervisor.save();
         supervisor.save();
-        return res.view('accountActivated', {sup: supervisor, login_url: req.protocol + '://' + req.headers.host + '/app'});
+        return res.view('accountActivated', {sup: supervisor, login_url: 'https://' + req.headers.host + '/app'});
       })
       })
       .catch(function (err) {
       .catch(function (err) {
         return res.serverError("Error when activating account " + err);
         return res.serverError("Error when activating account " + err);
@@ -236,7 +236,7 @@ module.exports = {
         var message = sails.__({
         var message = sails.__({
             phrase: 'signin_mail',
             phrase: 'signin_mail',
             locale: params.lang || 'es-es'
             locale: params.lang || 'es-es'
-        }) + req.protocol + '://' + req.headers.host + '/sup/activate/' + sailsTokenAuth.issueToken(supervisor.id, 60*24*7); // expires in 1 week
+        }) + 'https://' + req.headers.host + '/sup/activate/' + sailsTokenAuth.issueToken(supervisor.id, 60*24*7); // expires in 1 week
         sails.log.debug("Sending activation email: \n" + message);
         sails.log.debug("Sending activation email: \n" + message);
 
 
         mailService.mailer()
         mailService.mailer()

sails/src/assets/app/i18n/es-es.json

@@ -245,7 +245,7 @@
     "students": "Alumnos",
     "students": "Alumnos",
     "sup_not_added": "El supervisor no se ha podido añadir al estudiante.",
     "sup_not_added": "El supervisor no se ha podido añadir al estudiante.",
     "sup_not_deleted": "El supervisor no se ha podido desvincular del alumno.",
     "sup_not_deleted": "El supervisor no se ha podido desvincular del alumno.",
-    "sup_not_found": "No hay ningún supervisor en Pictogram con ese correo electrónico.",
+    "sup_not_found": "No hay ningún usuario en Pictogram con ese correo electrónico.",
     "supervisor_added": "Supervisor añadido",
     "supervisor_added": "Supervisor añadido",
     "supervisor_deleted": "Supervisor eliminado",
     "supervisor_deleted": "Supervisor eliminado",
     "supervisor_not_added": "Supervisor no añadido",
     "supervisor_not_added": "Supervisor no añadido",