Merge lp:~openerp-dev/openobject-addons/trunk-bug-1212109-jar into lp:openobject-addons

[Jaydeep Barot(OpenERP)]

Hello,

[trunk]
     --> I have fix this problem.able to reply message from inbox.

Thanks,
Jaydeep Barot.

[Atul Patel(OpenERP) (atp-openerp)]

Hello,

we donot get child record for first enter inbox message.
that's why need to check parent_message.
seems ok

Thanks

review: Approve

[lp:~openerp-dev/openobject-addons/trunk-bug-1212109-jar]

8889. By Mehul Mehta(OpenERP) on 2013-10-29

[Merge] with main main addons

Unmerged revisions

8889. By Mehul Mehta(OpenERP) on 2013-10-29

[Merge] with main main addons

8888. By Jaydeep Barot(OpenERP) on 2013-09-09

[FIX] add condition on parent_message in mail.js

=== modified file 'mail/static/src/js/mail.js'
--- mail/static/src/js/mail.js	2013-10-09 18:03:37 +0000
+++ mail/static/src/js/mail.js	2013-10-29 07:31:00 +0000
@@ -834,7 +834,9 @@
                 // go to the parented message
                 var message = this.parent_thread.parent_message;
                 var parent_message = message.parent_id ? message.parent_thread.parent_message : message;
-                var messages = [parent_message].concat(parent_message.get_childs());
+                if(parent_message){
+                    var messages = [parent_message].concat(parent_message.get_childs());
+                }
             } else if (this.options.emails_from_on_composer) {
                 // get all wall messages if is not a mail.Wall
                 _.each(this.options.root_thread.messages, function (msg) {messages.push(msg); messages.concat(msg.get_childs());});