Merge lp:~openerp-dev/openobject-addons/trunk-messaging-search-rga into lp:openobject-addons

[Kuldeep Joshi(OpenERP)]

-> Add a quick search based on application
-> Add a "Mark all read" in Inbox
-> Don't show full composer icon when clicking on log a note in any object

[lp:~openerp-dev/openobject-addons/trunk-messaging-search-rga]

9012. By Kuldeep Joshi(OpenERP) on 2014-01-03

[IMP] mail: change method name and code

9013. By Atul Patel(OpenERP) on 2014-01-06

[IMP]: Improve fnct_search method for mail message.

9014. By Atul Patel(OpenERP) on 2014-02-21

[MERGE]: Merged with addons

9015. By Chirag Dodiya(OpenERP) on 2014-03-21

[MRG]Merge with lp:openobject-addons

9016. By Atul Patel(OpenERP) on 2014-03-31

[MERGE]: Merged with addons

9017. By Atul Patel(OpenERP) on 2014-04-25

[MERGE]: Merged with addons

[Harry (OpenERP) (hmo-tinyerp)]

Hello,

need some correction in _search_application method:

* if args[0] is not contains more than 4 elements, It will be break
* if model_id is not exits in "ir.model" recordlist, It will be break.
* if not application_id, why return [('id','=','0')] ?

review: Needs Fixing (technical)

[lp:~openerp-dev/openobject-addons/trunk-messaging-search-rga]

9018. By Atul Patel(OpenERP) on 2014-04-25

[IMP]: Improve fnct_search method to quick search based on application

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

Hello,

Improve _seach_application method

Thanks

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

review: Needs Resubmitting

[lp:~openerp-dev/openobject-addons/trunk-messaging-search-rga]

9019. By Atul Patel(OpenERP) on 2014-04-25

[IMP]: remove integer condition for value

9020. By Atul Patel(OpenERP) on 2014-05-05

[MERGE]: Merged with addons

9021. By Atul Patel(OpenERP) on 2014-05-12

[MERGE]: Merged with addons

Unmerged revisions

9021. By Atul Patel(OpenERP) on 2014-05-12

[MERGE]: Merged with addons

9020. By Atul Patel(OpenERP) on 2014-05-05

[MERGE]: Merged with addons

9019. By Atul Patel(OpenERP) on 2014-04-25

[IMP]: remove integer condition for value

9018. By Atul Patel(OpenERP) on 2014-04-25

[IMP]: Improve fnct_search method to quick search based on application

9017. By Atul Patel(OpenERP) on 2014-04-25

[MERGE]: Merged with addons

9016. By Atul Patel(OpenERP) on 2014-03-31

[MERGE]: Merged with addons

9015. By Chirag Dodiya(OpenERP) on 2014-03-21

[MRG]Merge with lp:openobject-addons

9014. By Atul Patel(OpenERP) on 2014-02-21

[MERGE]: Merged with addons

9013. By Atul Patel(OpenERP) on 2014-01-06

[IMP]: Improve fnct_search method for mail message.

9012. By Kuldeep Joshi(OpenERP) on 2014-01-03

[IMP] mail: change method name and code

=== modified file 'mail/mail_message.py'
--- mail/mail_message.py	2014-05-09 10:23:55 +0000
+++ mail/mail_message.py	2014-05-12 12:14:06 +0000
@@ -113,7 +113,20 @@
         for notif in notif_obj.browse(cr, uid, notif_ids, context=context):
             res[notif.message_id.id] = True
         return res
-
+    
+    def _search_application(self, cr, uid, obj, name, args, context=None):
+        if not args:
+            return []
+        res = []
+        application_ids = []
+        model_pool = self.pool.get('ir.model')
+        for field,operator,value in args:
+            if field == 'model_id':
+                model = model_pool.browse(cr, uid, value, context=context).model
+                application_ids = self.search(cr, uid, [('model','=', model)])
+            res.append(('id', 'in', application_ids))
+        return res
+    
     def _search_starred(self, cr, uid, obj, name, domain, context=None):
         """ Search for messages to read by the current user. Condition is
             inversed because we search unread message on a read column. """
@@ -145,6 +158,8 @@
             ondelete='set null', help="Initial thread message."),
         'child_ids': fields.one2many('mail.message', 'parent_id', 'Child Messages'),
         'model': fields.char('Related Document Model', size=128, select=1),
+        'model_id': fields.function(lambda *x : {}, type='many2one', relation='ir.model',
+            fnct_search=_search_application, string='Application'),
         'res_id': fields.integer('Related Document ID', select=1),
         'record_name': fields.char('Message Record Name', help="Name get of the related document."),
         'notification_ids': fields.one2many('mail.notification', 'message_id',
 
=== modified file 'mail/mail_message_view.xml'
--- mail/mail_message_view.xml	2014-04-01 16:47:00 +0000
+++ mail/mail_message_view.xml	2014-05-12 12:14:06 +0000
@@ -59,6 +59,7 @@
                     <field name="body" string="Content" filter_domain="['|', ('subject', 'ilike', self), ('body', 'ilike', self)]" />
                     <field name="subject"/>
                     <field name="type"/>
+                    <field name="model_id"/>
                     <field name="author_id"/>
                     <field name="partner_ids"/>
                     <field name="model"/>
 
=== modified file 'mail/static/src/css/mail.css'
--- mail/static/src/css/mail.css	2014-04-10 15:50:22 +0000
+++ mail/static/src/css/mail.css	2014-05-12 12:14:06 +0000
@@ -271,6 +271,13 @@
     background: white;
     font-size: 14px;
     font-style: italic;
+    width: 95%;
+    float: left;
+}
+.openerp .oe_mail .mark_all_read {
+    display: inline-block;
+    margin-left: 5px;
+    margin-top: -5px;
 }
 
 /* d) I.E. tweaks for Message action icons */
 
=== modified file 'mail/static/src/js/mail.js'
--- mail/static/src/js/mail.js	2014-03-25 14:25:35 +0000
+++ mail/static/src/js/mail.js	2014-05-12 12:14:06 +0000
@@ -472,6 +472,7 @@
             this.$('.oe_compact_inbox').on('click', self.on_toggle_quick_composer);
             this.$('.oe_compose_post').on('click', self.on_toggle_quick_composer);
             this.$('.oe_compose_log').on('click', self.on_toggle_quick_composer);
+            this.$('.mark_all_read').on('click', _.bind(self.mark_all_read, this));
             this.$('input.oe_form_binary_file').on('change', _.bind( this.on_attachment_change, this));
             this.$('.oe_cancel').on('click', _.bind( this.on_cancel, this));
             this.$('.oe_post').on('click', self.on_message_post);
@@ -492,6 +493,12 @@
 
             this.$(".oe_recipients").on('change', 'input', this.on_checked_recipient);
         },
+        
+        mark_all_read: function(){
+            _.each(this.parent_thread.messages, function (thread) {
+                thread.on_message_read_unread(true);
+            });
+        },
 
         on_compose_fullmail: function (default_composition_mode) {
             var self = this;
 
=== modified file 'mail/static/src/xml/mail.xml'
--- mail/static/src/xml/mail.xml	2014-05-07 16:51:26 +0000
+++ mail/static/src/xml/mail.xml	2014-05-12 12:14:06 +0000
@@ -26,7 +26,9 @@
             </div>
             <div class="oe_msg_center">
                 <div class="oe_msg_content">
+                    <t t-if="!widget.is_log">
                     <button class="oe_full" title="Open the full mail composer"><span class='oe_e'>&amp;ograve</span></button>
+                    </t>
                     <t t-call="mail.thread.list_recipients"/>
                     <textarea class="field_text"></textarea>
                 </div>
@@ -46,6 +48,7 @@
                     <t t-if="widget.options.compose_placeholder" t-raw="widget.options.compose_placeholder"/>
                     <t t-if="!widget.options.compose_placeholder and widget.options.view_mailbox">Share with my followers...</t>
                 </div>
+                <div class="mark_all_read"><a class="oe_e" title="Mark all read">W</a></div>
             </t>
             <t t-if="!widget.options.view_mailbox">
                 <div class="field_text oe_compact oe_compact_record">