issue #745 closed

sails/src/assets/app/i18n/en-gb.json

@@ -99,6 +99,7 @@
     "error_fetching_students": "Error when loading students",
     "error_fetching_students": "Error when loading students",
     "error_only_support_images": "Only images are supported (JPG, PNG or GIF files)",
     "error_only_support_images": "Only images are supported (JPG, PNG or GIF files)",
     "error_on_request": "The request has not been processed. Please, check your fields",
     "error_on_request": "The request has not been processed. Please, check your fields",
+    "error_on_request_sup_not_found": "Account not found or it has not been activated",
     "error_loading_pictos": "Error loading pictos information",
     "error_loading_pictos": "Error loading pictos information",
     "error_general": "An error has been produced",
     "error_general": "An error has been produced",
     "expand_navigation": "Expand navigation",
     "expand_navigation": "Expand navigation",

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

@@ -102,6 +102,7 @@
     "error_fetching_students": "Error al cargar estudiantes",
     "error_fetching_students": "Error al cargar estudiantes",
     "error_only_support_images": "Sólo se soportan imágenes (ficheros JPG, PNG o GIF)",
     "error_only_support_images": "Sólo se soportan imágenes (ficheros JPG, PNG o GIF)",
     "error_on_request": "Se ha producido un error. Por favor, compruebe los valores introducidos.",
     "error_on_request": "Se ha producido un error. Por favor, compruebe los valores introducidos.",
+    "error_on_request_sup_not_found": "La cuenta no existe o no ha sido activada",
     "error_loading_pictos": "Error cargando información de los pictos",
     "error_loading_pictos": "Error cargando información de los pictos",
     "error_general": "Se ha producido un error",
     "error_general": "Se ha producido un error",
     "February": "Febrero",
     "February": "Febrero",

sails/src/assets/scripts/modules/login/controllers/login_setting_password.js

@@ -49,7 +49,12 @@ dashboardControllers.controller('LoginSettingPasswordCtrl', function LoginSettin
       })
       })
       .error(function(data, status, headers, config) {
       .error(function(data, status, headers, config) {
         $scope.reset();
         $scope.reset();
-        ngToast.danger({ content: $translate.instant('error_on_request') });
+        console.log(data);
+        console.log(data.search("not found"));
+        if (data.search("not found") > 0)
+          ngToast.danger({ content: $translate.instant('error_on_request_sup_not_found') });
+        else
+          ngToast.danger({ content: $translate.instant('error_on_request') });
       });
       });
     }
     }
   };
   };