amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-21 11:25:24 +00:00
Code Issues Projects Releases Wiki Activity

(js) Improve addressbook create/delete handling

Browse Source
This commit is contained in:
Francis Lachapelle
2015-12-14 12:19:15 -05:00
parent bbb9f31c29
commit 558795327e
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/WebServerResources/js/Contacts/Contacts.app.js
+9 -6
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);