LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

(js) Improve addressbook create/delete handling

pull/186/head
Francis Lachapelle 2015-12-14 12:19:15 -05:00
parent bbb9f31c29
commit 558795327e
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
UI/WebServerResources/js/Contacts/AddressBook.service.js
View File

@ -423,9 +423,7 @@
var i = _.indexOf(_.pluck(list, 'id'), _this.id);
list.splice(i, 1);
d.resolve();
}, function(data, status) {
d.reject(data);
});
}, d.reject);
return d.promise;
};

5
UI/WebServerResources/js/Contacts/AddressBooksController.js
View File

@ -105,10 +105,11 @@
vm.service.selectedFolder = null;
return true;
})
.catch(function(data, status) {
.catch(function(response) {
var message = response.data.message || response.statusText;
Dialog.alert(l('An error occured while deleting the addressbook "%{0}".',
vm.service.selectedFolder.name),
l(data.error));
message);
});
}
}

15
UI/WebServerResources/js/Contacts/Contacts.app.js
View File

@ -102,13 +102,16 @@
/**
* @ngInject
*/
stateAddressbook.$inject = ['$stateParams', 'stateAddressbooks', 'AddressBook'];
function stateAddressbook($stateParams, stateAddressbooks, AddressBook) {
var addressbook = _.find(stateAddressbooks, function(addressbook) {
stateAddressbook.$inject = ['$q', '$state', '$stateParams', 'AddressBook'];
function stateAddressbook($q, $state, $stateParams, AddressBook) {
var addressbook = _.find(AddressBook.$findAll(), function(addressbook) {
return addressbook.id == $stateParams.addressbookId;
});
addressbook.$reload();
return addressbook;
if (addressbook) {
addressbook.$reload();
return addressbook;
}
return $q.reject('Addressbook ' + $stateParams.addressbookId + ' not found');
}
/**
@ -138,7 +141,7 @@
function runBlock($rootScope, $log, $state) {
$rootScope.$on('$stateChangeError', function(event, toState, toParams, fromState, fromParams, error) {
$log.error(error);
$state.go('app');
$state.go('app.addressbook', { addressbookId: 'personal' });
});
$rootScope.$on('$routeChangeError', function(event, current, previous, rejection) {
$log.error(event, current, previous, rejection);