Fixed error messages displaying in modals. (#1254)

LGTM
This commit is contained in:
kun wang 2016-12-16 17:27:40 +08:00 committed by yhua123
parent 3717b37dca
commit d50ec3808a
8 changed files with 23 additions and 23 deletions

View File

@ -269,7 +269,7 @@
vm.checkDestinationPolicyStatus();
}
function listReplicationPolicyFailed(data, status) {
vm.errorMessages.push($filter('tr')('failed_to_get_replication_policy') + data);
vm.errorMessages.push($filter('tr')('failed_to_get_replication_policy'));
console.log('Failed to list replication policy:' + data);
}
function createReplicationPolicySuccess(data, status) {
@ -283,9 +283,9 @@
if(status === 409) {
vm.errorMessages.push($filter('tr')('policy_already_exists'));
}else{
vm.errorMessages.push($filter('tr')('failed_to_create_replication_policy') + data);
vm.errorMessages.push($filter('tr')('failed_to_create_replication_policy'));
}
console.log('Failed to create replication policy.');
console.log('Failed to create replication policy:' + data);
}
function updateReplicationPolicySuccess(data, status) {
console.log('Successful update replication policy.');
@ -295,8 +295,8 @@
}
function updateReplicationPolicyFailed(data, status) {
vm.saveTIP = false;
vm.errorMessages.push($filter('tr')('failed_to_update_replication_policy') + data);
console.log('Failed to update replication policy.');
vm.errorMessages.push($filter('tr')('failed_to_update_replication_policy'));
console.log('Failed to update replication policy:' + data);
}
function createDestinationSuccess(data, status, headers) {
var content = headers('Location');
@ -305,8 +305,8 @@
saveOrUpdatePolicy();
}
function createDestinationFailed(data, status) {
vm.errorMessages.push($filter('tr')('failed_to_create_destination') + data);
console.log('Failed to create destination.');
vm.errorMessages.push($filter('tr')('failed_to_create_destination'));
console.log('Failed to create destination:' + data);
}
function updateDestinationSuccess(data, status) {
console.log('Successful update destination.');
@ -314,9 +314,9 @@
saveOrUpdatePolicy();
}
function updateDestinationFailed(data, status) {
vm.errorMessages.push($filter('tr')('failed_to_update_destination') + data);
vm.errorMessages.push($filter('tr')('failed_to_update_destination'));
$scope.$broadcast('showDialog', true);
console.log('Failed to update destination.');
console.log('Failed to update destination:' + data);
}
function pingDestinationSuccess(data, status) {
vm.pingAvailable = true;
@ -328,7 +328,7 @@
if(status === 404) {
data = '';
}
vm.pingMessage = $filter('tr')('failed_to_ping_target', []) + data;
vm.pingMessage = $filter('tr')('failed_to_ping_target', []);
console.log("Failed to ping target:" + data);
vm.pingTIP = false;

View File

@ -63,9 +63,9 @@
function getTagFailed(data) {
$scope.$emit('modalTitle', $filter('tr')('error'));
$scope.$emit('modalMessage', $filter('tr')('failed_to_get_tag') + data);
$scope.$emit('modalMessage', $filter('tr')('failed_to_get_tag'));
$scope.$emit('raiseError', true);
console.log('Failed to get tag:' + data);
console.log('Failed to get tags:' + data);
}
function deleteTag(e) {

View File

@ -35,7 +35,7 @@
function statProjectFailed(data) {
$scope.$emit('modalTitle', $filter('tr')('error'));
$scope.$emit('modalMessage', $filter('tr')('failed_to_get_stat') + data);
$scope.$emit('modalMessage', $filter('tr')('failed_to_get_stat'));
$scope.$emit('raiseError', true);
console.log('Failed to get stat:' + data);
}

View File

@ -83,7 +83,7 @@
if(status === 409) {
vm.errorMessages.push($filter('tr')('destination_already_exists'));
}else{
vm.errorMessages.push($filter('tr')('failed_to_create_destination') + data);
vm.errorMessages.push($filter('tr')('failed_to_create_destination'));
}
console.log('Failed to create destination:' + data);
}
@ -101,8 +101,8 @@
}
function updateDestinationFailed(data, status) {
vm.errorMessages.push($filter('tr')('failed_to_update_destination') + data);
console.log('Failed to update destination.');
vm.errorMessages.push($filter('tr')('failed_to_update_destination'));
console.log('Failed to update destination:' + data);
}
@ -166,7 +166,7 @@
if(status === 404) {
data = '';
}
vm.pingMessage = $filter('tr')('failed_to_ping_target', []) + data;
vm.pingMessage = $filter('tr')('failed_to_ping_target', []);
console.log("Failed to ping target:" + data);
}
}

View File

@ -97,9 +97,9 @@
function deleteDestinationFailed(data, status) {
$scope.$emit('modalTitle', $filter('tr')('error'));
$scope.$emit('modalMessage', $filter('tr')('failed_to_delete_destination') + data);
$scope.$emit('modalMessage', $filter('tr')('failed_to_delete_destination'));
$scope.$emit('raiseError', true);
console.log('Failed to delete destination.');
console.log('Failed to delete destination:' + data);
}
}

View File

@ -37,7 +37,7 @@
function listIntegratedLogFailed(data, status) {
$scope.$emit('modalTitle', $filter('tr')('error'));
$scope.$emit('modalMessage', $filter('tr')('failed_to_get_user_log') + data);
$scope.$emit('modalMessage', $filter('tr')('failed_to_get_user_log'));
$scope.$emit('raiseError', true);
console.log('Failed to get user logs:' + data);
}

View File

@ -95,11 +95,11 @@
if(status === 409) {
message = $filter('tr')('email_has_been_taken');
}else{
message = $filter('tr')('failed_to_update_user') + data;
message = $filter('tr')('failed_to_update_user');
}
$scope.$emit('modalMessage', message);
$scope.$emit('raiseError', true);
console.log('Failed to update user.');
console.log('Failed to update user:' + data);
}
function cancel(form) {

View File

@ -86,7 +86,7 @@
vm.hasError = true;
$scope.$emit('modalTitle', $filter('tr')('error'));
$scope.$emit('modalMessage', $filter('tr')('failed_to_reset_pasword') + data);
$scope.$emit('modalMessage', $filter('tr')('failed_to_reset_pasword'));
$scope.$emit('raiseError', true);
console.log('Failed to reset password:' + data);