Merge branch 'feature/coreservice' into develop

beeman · beeman · commit 11e17b848fd0 · 2015-01-18T23:35:55.000+07:00
diff --git a/client/app/modules/core/services/core.service.js b/client/app/modules/core/services/core.service.js
@@ -1,7 +1,7 @@
 'use strict';
 var app = angular.module('com.module.core');
 
-app.service('CoreService', ['$http', 'SweetAlert', 'toasty', function ($http, SweetAlert, toasty) {
+app.service('CoreService', ['SweetAlert', 'toasty', function (SweetAlert, toasty) {
 
   this.alert = function (title, text) {
     SweetAlert.swal(title, text);
diff --git a/client/app/modules/users/config/users.auth.js b/client/app/modules/users/config/users.auth.js
@@ -3,7 +3,7 @@ angular.module('com.module.users')
   .config(function ($routeProvider, $httpProvider) {
 
     // Intercept 401 responses and redirect to login screen
-    $httpProvider.interceptors.push(function ($q, $location, CoreService, AppAuth, gettextCatalog) {
+    $httpProvider.interceptors.push(function ($q, $location, CoreService, AppAuth) {
       return {
         responseError: function (rejection) {
 
@@ -18,20 +18,20 @@ angular.module('com.module.users')
               if ($location.path() !== '/register') {
                 $location.path('/login');
               }
-              CoreService.toastWarning(gettextCatalog.getString('Error 401 received'), gettextCatalog.getString('We received a 401 error from the API! Redirecting to login'));
+              CoreService.toastWarning('Error 401 received', 'We received a 401 error from the API! Redirecting to login');
             }
           }
           if (rejection.status === 404) {
             console.log(rejection);
-            CoreService.toastError(gettextCatalog.getString('Error 404 received'), rejection.data.error.message);
+            CoreService.toastError('Error 404 received', rejection.data.error.message);
           }
           if (rejection.status === 422) {
             console.log(rejection);
-            CoreService.toastError(gettextCatalog.getString('Error 422 received'), rejection.data.error.message);
+            CoreService.toastError('Error 422 received', rejection.data.error.message);
           }
           if (rejection.status === 0) {
             $location.path('/');
-            CoreService.toastError(gettextCatalog.getString('Connection Refused'), gettextCatalog.getString('The connection to the API is refused. Please verify that the API is running!'));
+            CoreService.toastError('Connection Refused', 'The connection to the API is refused. Please verify that the API is running!');
           }
           return $q.reject(rejection);
         }
diff --git a/client/app/modules/users/controllers/users.ctrl.js b/client/app/modules/users/controllers/users.ctrl.js
@@ -49,7 +49,7 @@ app.controller('UsersCtrl', function ($scope, $stateParams, $state, CoreService,
       CoreService.toastSuccess(gettextCatalog.getString('User saved'), gettextCatalog.getString('This user is save!'));
       $state.go('^.list');
     }, function (err) {
-      CoreService.toastError(gettextCatalog.getString('Error saving user'));
+      CoreService.toastError(gettextCatalog.getString('Error saving user: ', + err));
     });
   };
 

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ angular.module('com.module.users')`
`3`	`3`	`.config(function ($routeProvider, $httpProvider) {`
`4`	`4`
`5`	`5`	`// Intercept 401 responses and redirect to login screen`
`6`		`- $httpProvider.interceptors.push(function ($q, $location, CoreService, AppAuth, gettextCatalog) {`
	`6`	`+ $httpProvider.interceptors.push(function ($q, $location, CoreService, AppAuth) {`
`7`	`7`	`return {`
`8`	`8`	`responseError: function (rejection) {`
`9`	`9`
`@@ -18,20 +18,20 @@ angular.module('com.module.users')`
`18`	`18`	`if ($location.path() !== '/register') {`
`19`	`19`	`$location.path('/login');`
`20`	`20`	`}`
`21`		`- CoreService.toastWarning(gettextCatalog.getString('Error 401 received'), gettextCatalog.getString('We received a 401 error from the API! Redirecting to login'));`
	`21`	`+ CoreService.toastWarning('Error 401 received', 'We received a 401 error from the API! Redirecting to login');`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`	`if (rejection.status === 404) {`
`25`	`25`	`console.log(rejection);`
`26`		`- CoreService.toastError(gettextCatalog.getString('Error 404 received'), rejection.data.error.message);`
	`26`	`+ CoreService.toastError('Error 404 received', rejection.data.error.message);`
`27`	`27`	`}`
`28`	`28`	`if (rejection.status === 422) {`
`29`	`29`	`console.log(rejection);`
`30`		`- CoreService.toastError(gettextCatalog.getString('Error 422 received'), rejection.data.error.message);`
	`30`	`+ CoreService.toastError('Error 422 received', rejection.data.error.message);`
`31`	`31`	`}`
`32`	`32`	`if (rejection.status === 0) {`
`33`	`33`	`$location.path('/');`
`34`		`- CoreService.toastError(gettextCatalog.getString('Connection Refused'), gettextCatalog.getString('The connection to the API is refused. Please verify that the API is running!'));`
	`34`	`+ CoreService.toastError('Connection Refused', 'The connection to the API is refused. Please verify that the API is running!');`
`35`	`35`	`}`
`36`	`36`	`return $q.reject(rejection);`
`37`	`37`	`}`