🔨 Fix: error msgs can be solved in one place

AschPlatform · Jan 9, 2018 · 6846bcb · 6846bcb
1 parent 773a773
commit 6846bcb
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 50 deletions.
diff --git a/public/src/partials/addACL/addaclCtrl.js b/public/src/partials/addACL/addaclCtrl.js
@@ -34,13 +34,7 @@ angular.module('asch').controller('addaclCtrl', function ($scope, $rootScope, ap
                     $scope.addList = '';
                     toast($translate.instant('INF_OPERATION_SUCCEEDED'));
                     $scope.comfirmDialogClose();
-                } else {
-                    toastError(res.error);
                 }
-            } else if(err === 'adjust'){
-                toastError($translate.instant('ADJUST_TIME_YOURSELF'));
-            } else {;
-                toastError($translate.instant('ERR_SERVER_ERROR'));
             }
         })
     }

diff --git a/public/src/partials/application/applicationCtrl.js b/public/src/partials/application/applicationCtrl.js
@@ -184,13 +184,7 @@ angular.module('asch').controller('applicationCtrl', function ($scope, $rootScop
           toast($translate.instant('DEPOSIT_SUCCESS'));
         } else if(res.error.indexOf('Old address') != -1 || res.error.indexOf('old address') != -1 || res.error.indexOf('老地址') != -1 || res.error.indexOf('数字地址') != -1) {
           toastError('dapp不支持老地址（数字地址），请用最新的字母地址（base58格式）');
-        } else {
-          toastError(res.error);
         }
-      } else if(err === 'adjust'){
-        toastError($translate.instant('ADJUST_TIME_YOURSELF'));
-      } else {
-        toastError($translate.instant('ERR_SERVER_ERROR'));
       }
     })
    }

diff --git a/public/src/partials/modal/assignee/assigneeCtrl.js b/public/src/partials/modal/assignee/assigneeCtrl.js
@@ -39,13 +39,7 @@ angular.module('asch').controller('assigneeCtrl', function ($scope, $rootScope,
                     $scope.Close();
                     toast($translate.instant('INF_REGISTER_SUCCESS'));
                     $scope.userName = '';
-                } else {
-                    toastError(res.error);
                 }
-            } else if(err === 'adjust'){
-                toastError($translate.instant('ADJUST_TIME_YOURSELF'));
-            } else {;
-                toastError($translate.instant('ERR_SERVER_ERROR'));
             }
         })
     };

diff --git a/public/src/partials/modal/deletevote/deletevoteCtrl.js b/public/src/partials/modal/deletevote/deletevoteCtrl.js
@@ -25,13 +25,7 @@ angular.module('asch').controller('deletevoteCtrl', function ($scope, $rootScope
                     $scope.Close();
                     $rootScope.$emit('downvoteSuccess');
                     toast($translate.instant('INF_DELETE_SUCCESS'));
-                } else {
-                    toastError(res.error);
                 }
-            } else if(err === 'adjust'){
-                toastError($translate.instant('ADJUST_TIME_YOURSELF'));
-            } else {;
-                toastError($translate.instant('ERR_SERVER_ERROR'));
             }
         })
     };

diff --git a/public/src/partials/modal/voteto/votetoCtrl.js b/public/src/partials/modal/voteto/votetoCtrl.js
@@ -25,13 +25,7 @@ angular.module('asch').controller('votetoCtrl', function ($scope, $rootScope, ap
                     $scope.Close();
                     $rootScope.$emit('upvoteSuccess');
                     toast($translate.instant('INF_VOTE_SUCCESS'));
-                } else {
-                    toastError(res.error)
                 }
-            } else if(err === 'adjust'){
-                toastError($translate.instant('ADJUST_TIME_YOURSELF'));
-            } else {
-                toastError($translate.instant('ERR_SERVER_ERROR'));
             }
         })
     };

diff --git a/public/src/partials/pay/payCtrl.js b/public/src/partials/pay/payCtrl.js
@@ -81,15 +81,11 @@ angular.module('asch').controller('payCtrl', function ($scope, $rootScope, $filt
                     $scope.secondPassword = '';
                     toast($translate.instant('INF_TRANSFER_SUCCESS'));
                 } else {
-                    toastError(res.error);
-                }
-            } else {
-                if (res.error.indexOf('Insufficient') > -1) {
-                    toastError($translate.instant('ERR_BALANCE_NOT_ENOUGH'));
-                } else if(res.error.indexOf('locked') > -1) {
-                    toastError($translate.instant('ALREADY_LOCKED'));
-                } else {
-                    toastError($translate.instant('ERR_SERVER_ERROR'));
+                    if (res.error.indexOf('Insufficient') > -1) {
+                        toastError($translate.instant('ERR_BALANCE_NOT_ENOUGH'));
+                    } else if(res.error.indexOf('locked') > -1) {
+                        toastError($translate.instant('ALREADY_LOCKED'));
+                    }
                 }
             }
         })

diff --git a/public/src/partials/personal/personalCtrl.js b/public/src/partials/personal/personalCtrl.js
@@ -130,10 +130,6 @@ angular.module('asch').controller('personalCtrl', function ($scope, $rootScope,
 					} else {
 						toastError(res.error);
 					}
-				} else if(err === 'adjust'){
-					toastError($translate.instant('ADJUST_TIME_YOURSELF'));
-				} else {
-					toastError($translate.instant('ERR_SERVER_ERROR'));
 				}
 			})
 		}

diff --git a/public/src/partials/reduceACL/reduceaclCtrl.js b/public/src/partials/reduceACL/reduceaclCtrl.js
@@ -42,13 +42,7 @@ angular.module('asch').controller('reduceaclCtrl', function ($scope, $rootScope,
                     $scope.secondPassword = ''
                     toast($translate.instant('INF_OPERATION_SUCCEEDED'));
                     $scope.comfirmDialogClose();
-                } else {
-                    toastError(res.error)
                 }
-            } else if(err === 'adjust'){
-                toastError($translate.instant('ADJUST_TIME_YOURSELF'));
-            } else {;
-                toastError($translate.instant('ERR_SERVER_ERROR'));
             }
         })
     }

diff --git a/public/src/service/postSerivice.js b/public/src/service/postSerivice.js
@@ -83,7 +83,7 @@ angular.module('asch').service('postSerivice', function ($http, $translate, $roo
             console.log('broadcastTransaction-fail',data);
             // 统一管理错误信息
             translateErrMsg($rootScope.languageSelected,data.error);
-            callback(1, data);
+            callback(null, data);
 
         }).error(function(data, status, headers, config){
             retryOrCallbak(data);