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

(js) Fix loading of card from global addressbooks

pull/213/head
Francis Lachapelle 2016-06-06 10:32:45 -04:00
parent 5983c5cf4d
commit 2a053400d7
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -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)
------------------ ------------------

1
UI/WebServerResources/js/Contacts/AddressBook.service.js
View File

@ -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));
}); });
} }

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

@ -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) {