refactored

Author: hikalkan

SimpleTaskSystemSPA_AngularJs_EntityFramework/SimpleTaskSystem.Web/Abp/Framework/scripts/libs/angular/abp.ng.js

@@ -4,13 +4,17 @@
         return;
     }
 
-    // 'abp' module ///////////////////////////////////////////////////////////
-
     var abpModule = angular.module('abp', []);
 
     abpModule.config([
         '$httpProvider', function ($httpProvider) {
             $httpProvider.interceptors.push(function ($q) {
+
+                var defaultError = {
+                    message: 'Ajax request is not succeed!',
+                    details: 'Error detail is not sent by server.'
+                };
+
                 return {
                     'response': function (response) {
                         if (!response.config || !response.config.abp || !response.data) {
@@ -19,21 +23,14 @@
 
                         var defer = $q.defer();
 
-                        if (response.data.targetUrl) { //TODO: Check if it works and does not prevent return value!
-                            location.href = data.targetUrl;
-                        }
-
                         if (response.data.success === true) {
                             response.data = response.data.result;
                             defer.resolve(response);
                         } else { //data.success === false
                             if (response.data.error) {
                                 abp.message.error(response.data.error.message);
                             } else {
-                                response.data.error = {
-                                    message: 'Ajax request is not succeed!',
-                                    details: 'Error detail is not sent by server.'
-                                };
+                                response.data.error = defaultError;
                             }
 
                             abp.log.error(response.data.error.message + ' | ' + response.data.error.details);
@@ -46,6 +43,10 @@
                             }
                         }
 
+                        if (response.data.targetUrl) {
+                            location.href = data.targetUrl;
+                        }
+
                         return defer.promise;
                     }
                 };

SimpleTaskSystemSPA_AngularJs_EntityFramework/SimpleTaskSystem.Web/App/Main/views/task/list.js

@@ -19,11 +19,7 @@
             taskService.getTasks({
                 state: $scope.selectedTaskState > 0 ? $scope.selectedTaskState : null
             }).success(function (data) {
-                console.log(arguments);
                 vm.tasks = data.tasks;
-            }).error(function (a) {
-                console.log('error!');
-                console.log(arguments);
             });
         };