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

(js) Fix message initialization in popup window 

Fixes #3583
pull/203/head
Francis Lachapelle 2016-03-15 09:58:58 -04:00
parent 0af364d076
commit dec3f94392
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -15,6 +15,7 @@ Bug fixes
- [web] respect super user privileges to create in any calendar and addressbook (#3533) - [web] respect super user privileges to create in any calendar and addressbook (#3533)
- [web] properly null-terminate IS8601-formatted dates (#3539) - [web] properly null-terminate IS8601-formatted dates (#3539)
- [web] display CC/BCC fields in message editor when initialized with values - [web] display CC/BCC fields in message editor when initialized with values
- [web] fixed message initialization in popup window (#3583)
3.0.2 (2016-03-04) 3.0.2 (2016-03-04)
------------------ ------------------

2
UI/WebServerResources/js/Mailer/Mailer.popup.js
View File

@ -179,7 +179,7 @@
// Message is available from the parent window // Message is available from the parent window
message = new Message(stateMailbox.$account.id, message = new Message(stateMailbox.$account.id,
stateMailbox, stateMailbox,
window.opener.$messageController.message.$omit()); window.opener.$messageController.message.$omit({privateAttributes: true}));
return $q.when(message); return $q.when(message);
} }
else { else {

7
UI/WebServerResources/js/Mailer/Message.service.js
View File

@ -648,10 +648,11 @@
* @desc Return a sanitized object used to send to the server. * @desc Return a sanitized object used to send to the server.
* @return an object literal copy of the Message instance * @return an object literal copy of the Message instance
*/ */
Message.prototype.$omit = function() { Message.prototype.$omit = function(options) {
var message = {}; var message = {},
privateAttributes = options && options.privateAttributes;
angular.forEach(this, function(value, key) { angular.forEach(this, function(value, key) {
if (key != 'constructor' && key[0] != '$') { if (key != 'constructor' && key[0] != '$' || privateAttributes) {
message[key] = value; message[key] = value;
} }
}); });