odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] upstream 

bzr revid: fva@openerp.com-20121113143031-gom4b88czhnwvyj6
This commit is contained in:
Frédéric van der Essen 2012-11-13 15:30:31 +01:00
parent 0c16b8b4fa 0f3845bee6
commit 5bb9466813
2 changed files with 47 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
addons/mail/data/mail_demo.xml
View File

@ -93,14 +93,15 @@
<record id="msg_discussion2_0" model="mail.message">
<field name="subject">Plan to install OpenERP</field>
<field name="model">mail.message</field>
<field name="body"><![CDATA[<p>Hello
I am interested in your company's product and I plan to install OpenERP for my company and affordable price.
Can you please send me services catalogue?
Sophie]]></field>
<field name="body"><![CDATA[<p>Hello,<br/>
I am interested in your company's product and I plan to install OpenERP for my company and affordable price.<br/>
Can you please send me services catalogue?<br/>
Virginie</p>]]></field>
<field name="type">email</field>
<field name="subtype_id" ref="mt_comment"/>
<field name="email_from">virginie@agrolait.fr</field>
<field name="partner_ids" eval="[(6, 0, [ref('base.partner_demo'), ref('base.partner_root')])]"/>
<field name="notified_partner_ids" eval="[(6, 0, [ref('base.partner_demo'), ref('base.partner_root')])]"/>
</record>
<record id="msg_discussion2_1_attach" model="ir.attachment">
<field name="datas">bWlncmF0aW9uIHRlc3Q=</field>
@ -109,13 +110,13 @@ Sophie]]></field>
</record>
<record id="msg_discussion2_1" model="mail.message">
<field name="subject">Re: Plan to install OpenERP</field>
<field name="body">
Dear Customer,&lt;br/&gt;
Thanks for showing interest in our products.&lt;br/&gt;
We have attached the catalogue,&lt;br/&gt;
We would like to know your interests, so let us know when we can call you for more details.&lt;br/&gt;
<field name="body"><![CDATA[
Dear Customer,<br/>
Thanks for showing interest in our products.<br/>
We have attached the catalogue,<br/>
We would like to know your interests, so let us know when we can call you for more details.<br/>
Regards
</field>
]]></field>
<field name="type">comment</field>
<field name="subtype_id" ref="mt_comment"/>
<field name="parent_id" ref="msg_discussion2_0"/>
@ -202,30 +203,31 @@ Sophie]]></field>
</record>
<record id="message_video1" model="mail.message">
<field name="model">mail.group</field>
<field name="body">
Hi,&lt;br/&gt;
The beta OpenERP 7 is scheduled for November 12.&lt;br/&gt;
You will find attached the document for migration from version 6 to 7, and the activity graph for the current year. Good reading.&lt;br/&gt;
<field name="body"><![CDATA[
Hi,<br/>
The beta OpenERP 7 is scheduled for November 12.<br/>
You will find attached the document for migration from version 6 to 7, and the activity graph for the current year. Good reading.<br/>
Sincerely
</field>
]]></field>
<field name="type">comment</field>
<field name="subtype_id" ref="mt_comment"/>
<field name="author_id" ref="base.partner_demo"/>
<field name="author_id" ref="base.partner_root"/>
<field name="attachment_ids" eval="[(6, 0, [ref('message_video1_attachment1'), ref('message_video1_attachment2')])]"/>
<field name="notified_partner_ids" eval="[(6, 0, [ref('base.partner_demo'), ref('base.partner_root')])]"/>
<field name="date">2012-11-12 10:53:32</field>
</record>
<record id="message_video1_message1" model="mail.message">
<field name="model">mail.group</field>
<field name="body">
Thank you,&lt;br/&gt;
Could you prepare and send us also the document for version 7.1 which will come soon?&lt;br/&gt;
<field name="body"><![CDATA[
Thank you,<br/>
Could you prepare and send us also the document for version 7.1 which will come soon?<br/>
Sincerely
</field>
]]></field>
<field name="type">comment</field>
<field name="subtype_id" ref="mt_comment"/>
<field name="parent_id" ref="message_video1"/>
<field name="author_id" ref="base.partner_root"/>
<field name="author_id" ref="base.partner_demo"/>
<field name="partner_ids" eval="[(6, 0, [ref('base.partner_demo'), ref('base.partner_root')])]"/>
<field name="notified_partner_ids" eval="[(6, 0, [ref('base.partner_demo'), ref('base.partner_root')])]"/>
</record>

36
addons/mail/static/src/js/mail.js
View File

@ -860,7 +860,10 @@ openerp.mail = function (session) {
msg.animated_destroy(150);
} else {
msg.renderElement();
msg.start()
msg.start();
}
if( self.options.root_thread.__parentedParent.__parentedParent.get_menu_emails ) {
self.options.root_thread.__parentedParent.__parentedParent.get_menu_emails().do_reload();
}
});
@ -1000,10 +1003,7 @@ openerp.mail = function (session) {
init: function (parent, datasets, options) {
this._super(parent, options);
this.domain = options.domain || [];
this.context = _.extend({
default_model: 'mail.thread',
default_res_id: 0,
default_parent_id: false }, options.context || {});
this.context = _.extend(options.context || {});
this.options = options.options;
this.options.root_thread = (options.options.root_thread != undefined ? options.options.root_thread : this);
@ -1028,7 +1028,7 @@ openerp.mail = function (session) {
// object compose message
this.compose_message = false;
this.ds_thread = new session.web.DataSetSearch(this, this.context.default_model || 'mail.thread');
this.ds_thread = new session.web.DataSetSearch(this, this.context.default_model);
this.ds_message = new session.web.DataSetSearch(this, 'mail.message');
},
@ -1530,7 +1530,6 @@ openerp.mail = function (session) {
'display_indented_thread': -1,
'show_reply_button': false,
'show_read_unread_button': false,
'show_compose_message': this.view.is_action_enabled('edit'),
'show_compact_message': 1,
}, this.node.params);
@ -1556,9 +1555,10 @@ openerp.mail = function (session) {
return;
}
this.node.params = _.extend({
'message_ids': this.getParent().fields.message_ids ? this.getParent().fields.message_ids.get_value() : undefined,
}, this.node.params);
this.node.params = _.extend(this.node.params, {
'message_ids': this.get_value(),
'show_compose_message': this.view.is_action_enabled('edit'),
});
this.node.context = {
'default_res_id': this.view.datarecord.id || false,
'default_model': this.view.model || false,
@ -1571,7 +1571,6 @@ openerp.mail = function (session) {
// create and render Thread widget
this.root = new mail.Widget(this, _.extend(this.node, {
'domain' : (this.domain || []).concat([['model', '=', this.view.model], ['res_id', '=', this.view.datarecord.id]]),
}));
return this.root.replace(this.$('.oe_mail-placeholder'));
@ -1631,7 +1630,20 @@ openerp.mail = function (session) {
if (! this.searchview.has_defaults) {
this.message_render();
}
},
/**
* crete an object "related_menu"
* contain the menu widget and the the sub menu related of this wall
*/
get_menu_emails: function () {
var self = this;
if (!this.related_menu) {
var menu = this.__parentedParent.__parentedParent.menu;
var sub_menu = _.filter(menu.data.data.children, function (val) {return val.id == 100;})[0];
this.related_menu = menu;
}
return this.related_menu;
},
/**