(js) Fix loading of card from global addressbooks
parent
5983c5cf4d
commit
2a053400d7
1
NEWS
1
NEWS
|
@ -6,6 +6,7 @@ Bug fixes
|
||||||
- [web] fixed user removal from ACLs in Administration module (#3713)
|
- [web] fixed user removal from ACLs in Administration module (#3713)
|
||||||
- [web] fixed event classification icon (private/confidential) in month view (#3711)
|
- [web] fixed event classification icon (private/confidential) in month view (#3711)
|
||||||
- [web] CKEditor: added the pastefromword plugin (#2295, #3313)
|
- [web] CKEditor: added the pastefromword plugin (#2295, #3313)
|
||||||
|
- [web] fixed loading of card from global addressbooks
|
||||||
|
|
||||||
3.1.1 (2016-06-02)
|
3.1.1 (2016-06-02)
|
||||||
------------------
|
------------------
|
||||||
|
|
|
@ -702,6 +702,7 @@
|
||||||
_this.$cards = [];
|
_this.$cards = [];
|
||||||
angular.forEach(response.headers, function(data) {
|
angular.forEach(response.headers, function(data) {
|
||||||
var o = _.zipObject(headers, data);
|
var o = _.zipObject(headers, data);
|
||||||
|
angular.extend(o, { pid: _this.id });
|
||||||
_this.$cards.push(new AddressBook.$Card(o));
|
_this.$cards.push(new AddressBook.$Card(o));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
vm.mode = { search: false, multiple: 0 };
|
vm.mode = { search: false, multiple: 0 };
|
||||||
|
|
||||||
function selectCard(card) {
|
function selectCard(card) {
|
||||||
$state.go('app.addressbook.card.view', {addressbookId: stateAddressbook.id, cardId: card.id});
|
$state.go('app.addressbook.card.view', {cardId: card.id});
|
||||||
}
|
}
|
||||||
|
|
||||||
function toggleCardSelection($event, card) {
|
function toggleCardSelection($event, card) {
|
||||||
|
|
Loading…
Reference in New Issue