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();