(js) Fix references to Card objects in controllers
This commit is contained in:
parent
12f4f236e8
commit
a93874b6fe
|
@ -84,7 +84,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
function unselectCards() {
|
function unselectCards() {
|
||||||
_.each(vm.selectedFolder.cards, function(card) { card.selected = false; });
|
_.each(vm.selectedFolder.$cards, function(card) { card.selected = false; });
|
||||||
}
|
}
|
||||||
|
|
||||||
function confirmDeleteSelectedCards() {
|
function confirmDeleteSelectedCards() {
|
||||||
|
@ -93,7 +93,7 @@
|
||||||
{ ok: l('Delete') })
|
{ ok: l('Delete') })
|
||||||
.then(function() {
|
.then(function() {
|
||||||
// User confirmed the deletion
|
// 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);
|
vm.selectedFolder.$deleteCards(selectedCards);
|
||||||
delete vm.selectedFolder.selectedCard;
|
delete vm.selectedFolder.selectedCard;
|
||||||
}, function(data, status) {
|
}, function(data, status) {
|
||||||
|
@ -102,13 +102,13 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
function saveSelectedCards() {
|
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');
|
var selectedUIDs = _.pluck(selectedCards, 'id');
|
||||||
$window.location.href = ApplicationBaseURL + '/' + vm.selectedFolder.id + '/export?uid=' + selectedUIDs.join('&uid=');
|
$window.location.href = ApplicationBaseURL + '/' + vm.selectedFolder.id + '/export?uid=' + selectedUIDs.join('&uid=');
|
||||||
}
|
}
|
||||||
|
|
||||||
function copySelectedCards(folder) {
|
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() {
|
vm.selectedFolder.$copyCards(selectedCards, folder).then(function() {
|
||||||
// TODO: refresh target addressbook?
|
// TODO: refresh target addressbook?
|
||||||
}, function(error) {
|
}, function(error) {
|
||||||
|
@ -117,7 +117,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
function selectAll() {
|
function selectAll() {
|
||||||
_.each(vm.selectedFolder.cards, function(card) {
|
_.each(vm.selectedFolder.$cards, function(card) {
|
||||||
card.selected = true;
|
card.selected = true;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -173,7 +173,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
function newMessageWithSelectedCards($event) {
|
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 = [];
|
var promises = [], recipients = [];
|
||||||
|
|
||||||
_.each(selectedCards, function(card) {
|
_.each(selectedCards, function(card) {
|
||||||
|
|
|
@ -78,14 +78,14 @@
|
||||||
if (form.$valid) {
|
if (form.$valid) {
|
||||||
vm.card.$save()
|
vm.card.$save()
|
||||||
.then(function(data) {
|
.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) {
|
if (i < 0) {
|
||||||
// New card; reload contacts list and show addressbook in which the card has been created
|
// New card; reload contacts list and show addressbook in which the card has been created
|
||||||
AddressBook.selectedFolder.$reload();
|
AddressBook.selectedFolder.$reload();
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
// Update contacts list with new version of the Card object
|
// 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 });
|
$state.go('app.addressbook.card.view', { cardId: vm.card.id });
|
||||||
});
|
});
|
||||||
|
@ -122,7 +122,7 @@
|
||||||
card.$delete()
|
card.$delete()
|
||||||
.then(function() {
|
.then(function() {
|
||||||
// Remove card from addressbook
|
// 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;
|
return o.id == card.id;
|
||||||
});
|
});
|
||||||
close();
|
close();
|
||||||
|
|
Loading…
Reference in a new issue