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

(js) Fix references to Card objects in controllers

pull/201/head
Francis Lachapelle 2016-02-26 16:24:18 -05:00
parent 12f4f236e8
commit a93874b6fe
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
UI/WebServerResources/js/Contacts/AddressBookController.js
View File

@ -84,7 +84,7 @@
}
function unselectCards() {
_.each(vm.selectedFolder.cards, function(card) { card.selected = false; });
_.each(vm.selectedFolder.$cards, function(card) { card.selected = false; });
}
function confirmDeleteSelectedCards() {
@ -93,7 +93,7 @@
{ ok: l('Delete') })
.then(function() {
// User confirmed the deletion
var selectedCards = _.filter(vm.selectedFolder.cards, function(card) { return card.selected; });
var selectedCards = _.filter(vm.selectedFolder.$cards, function(card) { return card.selected; });
vm.selectedFolder.$deleteCards(selectedCards);
delete vm.selectedFolder.selectedCard;
}, function(data, status) {
@ -102,13 +102,13 @@
}
function saveSelectedCards() {
var selectedCards = _.filter(vm.selectedFolder.cards, function(card) { return card.selected; });
var selectedCards = _.filter(vm.selectedFolder.$cards, function(card) { return card.selected; });
var selectedUIDs = _.pluck(selectedCards, 'id');
$window.location.href = ApplicationBaseURL + '/' + vm.selectedFolder.id + '/export?uid=' + selectedUIDs.join('&uid=');
}
function copySelectedCards(folder) {
var selectedCards = _.filter(vm.selectedFolder.cards, function(card) { return card.selected; });
var selectedCards = _.filter(vm.selectedFolder.$cards, function(card) { return card.selected; });
vm.selectedFolder.$copyCards(selectedCards, folder).then(function() {
// TODO: refresh target addressbook?
}, function(error) {
@ -117,7 +117,7 @@
}
function selectAll() {
_.each(vm.selectedFolder.cards, function(card) {
_.each(vm.selectedFolder.$cards, function(card) {
card.selected = true;
});
}
@ -173,7 +173,7 @@
}
function newMessageWithSelectedCards($event) {
var selectedCards = _.filter(vm.selectedFolder.cards, function(card) { return card.selected; });
var selectedCards = _.filter(vm.selectedFolder.$cards, function(card) { return card.selected; });
var promises = [], recipients = [];
_.each(selectedCards, function(card) {

6
UI/WebServerResources/js/Contacts/CardController.js
View File

@ -78,14 +78,14 @@
if (form.$valid) {
vm.card.$save()
.then(function(data) {
var i = _.indexOf(_.pluck(AddressBook.selectedFolder.cards, 'id'), vm.card.id);
var i = _.indexOf(_.pluck(AddressBook.selectedFolder.$cards, 'id'), vm.card.id);
if (i < 0) {
// New card; reload contacts list and show addressbook in which the card has been created
AddressBook.selectedFolder.$reload();
}
else {
// Update contacts list with new version of the Card object
AddressBook.selectedFolder.cards[i] = angular.copy(vm.card);
AddressBook.selectedFolder.$cards[i] = angular.copy(vm.card);
}
$state.go('app.addressbook.card.view', { cardId: vm.card.id });
});
@ -122,7 +122,7 @@
card.$delete()
.then(function() {
// Remove card from addressbook
AddressBook.selectedFolder.cards = _.reject(AddressBook.selectedFolder.cards, function(o) {
AddressBook.selectedFolder.$cards = _.reject(AddressBook.selectedFolder.$cards, function(o) {
return o.id == card.id;
});
close();