amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-20 20:39:28 +00:00
Code Issues Projects Releases Wiki Activity

(fix) Save card in Contacts module

Browse Source
This commit is contained in:
Francis Lachapelle
2015-04-27 10:23:31 -04:00
parent 0f1b0bfbbe
commit d77f75da49
3 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
UI/WebServerResources/js/ContactsUI.js
View File

@@ -213,7 +213,7 @@
};
$scope.exportCards = function() {
window.location.href = ApplicationBaseURL + '/' + $rootScope.addressbook.id + '/exportFolder';
window.location.href = ApplicationBaseURL + '/' + $scope.currentFolder.id + '/exportFolder';
};
$scope.share = function() {
$mdDialog.show({
@@ -302,7 +302,6 @@
var currentAddressbook;
$rootScope.currentFolder = stateAddressbook;
$scope.addressbook = stateAddressbook;
$scope.newComponent = function(ev) {
$mdDialog.show({
@@ -330,11 +329,11 @@
});
function ComponentDialogController(scope, $mdDialog, state) {
scope.createContact = function() {
state.go('app.addressbook.new', { addressbookId: $scope.addressbook.id, contactType: 'card' });
state.go('app.addressbook.new', { addressbookId: $scope.currentFolder.id, contactType: 'card' });
$mdDialog.hide();
}
scope.createList = function() {
state.go('app.addressbook.new', { addressbookId: $scope.addressbook.id, contactType: 'list' });
state.go('app.addressbook.new', { addressbookId: $scope.currentFolder.id, contactType: 'list' });
$mdDialog.hide();
}
}
@@ -384,14 +383,14 @@
if (form.$valid) {
$scope.card.$save()
.then(function(data) {
var i = _.indexOf(_.pluck($rootScope.addressbook.cards, 'id'), $scope.card.id);
var i = _.indexOf(_.pluck($scope.currentFolder.cards, 'id'), $scope.card.id);
if (i < 0) {
// New card; reload contacts list and show addressbook in which the card has been created
$rootScope.addressbook = AddressBook.$find(data.pid);
$rootScope.currentFolder = AddressBook.$find(data.pid);
}
else {
// Update contacts list with new version of the Card object
$rootScope.addressbook.cards[i] = angular.copy($scope.card);
$rootScope.currentFolder.cards[i] = angular.copy($scope.card);
}
$state.go('app.addressbook.card.view', { cardId: $scope.card.id });
}, function(data, status) {
@@ -407,7 +406,7 @@
if ($scope.card.isNew) {
// Cancelling the creation of a card
$scope.card = null;
$state.go('app.addressbook', { addressbookId: $scope.addressbook.id });
$state.go('app.addressbook', { addressbookId: $scope.currentFolder.id });
}
else {
// Cancelling the edition of an existing card
@@ -422,12 +421,12 @@
card.$delete()
.then(function() {
// Remove card from list of addressbook
$rootScope.addressbook.cards = _.reject($rootScope.addressbook.cards, function(o) {
$rootScope.currentFolder.cards = _.reject($rootScope.currentFolder.cards, function(o) {
return o.id == card.id;
});
// Remove card object from scope
$scope.card = null;
$state.go('app.addressbook', { addressbookId: $scope.addressbook.id });
$state.go('app.addressbook', { addressbookId: $scope.currentFolder.id });
}, function(data, status) {
Dialog.alert(l('Warning'), l('An error occured while deleting the card "%{0}".',
card.$fullname()));