From f56cba59ae03ffbd55a7cce9d5d9526efb51c73b Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Tue, 19 Aug 2014 01:12:19 +0200
Subject: [PATCH] correctly handle errors

---
 src/main/app/js/main.js     | 3 +--
 src/main/app/js/services.js | 8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/main/app/js/main.js b/src/main/app/js/main.js
index f99cfc85..357a01f1 100644
--- a/src/main/app/js/main.js
+++ b/src/main/app/js/main.js
@@ -32,9 +32,8 @@ app.config([
 					var status = response.status;
 					if (status == 401) {
 						$injector.get('$state').transitionTo('welcome');
-						return $q.reject(response);
 					}
-					return response;
+					return $q.reject(response);
 				};
 
 				var promise = function(promise) {
diff --git a/src/main/app/js/services.js b/src/main/app/js/services.js
index f99f2993..b26c0236 100644
--- a/src/main/app/js/services.js
+++ b/src/main/app/js/services.js
@@ -243,12 +243,12 @@ module.factory('CategoryService', ['$resource', '$http', function($resource, $ht
 				callback(data);
 		});
 	};
-	res.refresh = function(callback) {
+	res.refresh = function(success, error) {
 		res.get(function(data) {
 			_.merge(res.subscriptions, data);
-			if (callback)
-				callback(data);
-		});
+			if (success)
+				success(data);
+		}, error);
 	};
 
 	res.init();