From 4bbc98f63d63a74707de3e5d8a5ab4659e28f658 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 24 Jun 2010 18:27:47 +0530
Subject: [PATCH] [IMP]: mail_gateway: Improvement in view * Added model and
 res_id in thread

bzr revid: rpa@tinyerp.com-20100624125747-k2t6nma3t6s9kn6j
---
 addons/mail_gateway/mail_gateway.py       | 25 ++++++++---
 addons/mail_gateway/mail_gateway_view.xml | 52 +++++++++++++++--------
 2 files changed, 53 insertions(+), 24 deletions(-)

diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index fd7a5753ecf..7a7c00c9deb 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -22,7 +22,11 @@
 from osv import osv, fields
 import time
 import tools
+import binascii
+import email
+from email.header import decode_header
 import base64
+import re
 
 class mailgate_thread(osv.osv):
     '''
@@ -30,10 +34,16 @@ class mailgate_thread(osv.osv):
     '''
     _name = 'mailgate.thread'
     _description = 'Mailgateway Thread'
+    _rec_name = 'thread' 
+
     _columns = {
-        'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('history', '=', True)]),
-        'log_ids': fields.one2many('mailgate.message', 'res_id', 'Logs', domain=[('history', '=', False)]),
-    }
+        'thread': fields.char('Thread', size=32, required=False), 
+        'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('history', '=', True)], readonly=True), 
+        'log_ids': fields.one2many('mailgate.message', 'res_id', 'Logs', domain=[('history', '=', False)], readonly=True), 
+        'model': fields.char('Model Name', size=64, required=False),  
+        'res_id': fields.integer('Resource ID'), 
+        }
+        
     def _history(self, cr, uid, cases, keyword, history=False, subject=None, email=False, details=None, email_from=False, message_id=False, attach=None, context=None):
         """
         @param self: The object pointer
@@ -63,8 +73,8 @@ class mailgate_thread(osv.osv):
             data = {
                 'name': keyword, 
                 'user_id': uid, 
-                'res_model' : case._name, 
-                'res_id': case.id,
+                'model' : case._name, 
+                'res_id': case.id, 
                 'date': time.strftime('%Y-%m-%d %H:%M:%S'), 
                 'message_id': message_id, 
             }
@@ -77,7 +87,7 @@ class mailgate_thread(osv.osv):
                     'name': subject or 'History', 
                     'history': True, 
                     'user_id': uid, 
-                    'res_model' : case._name, 
+                    'model' : case._name, 
                     'res_id': case.id,
                     'date': time.strftime('%Y-%m-%d %H:%M:%S'), 
                     'description': details or (hasattr(case, 'description') and case.description or False), 
@@ -104,8 +114,9 @@ class mailgate_message(osv.osv):
     _order = 'id desc'
     _columns = {
         'name':fields.char('Message', size=64), 
-        'res_model': fields.char('Object Name', size=128), 
+        'model': fields.char('Object Name', size=128), 
         'res_id': fields.integer('Resource ID'),
+        'ref_id': fields.char('Reference Id', size=256, readonly=True, help="Message Id in Email Server.", select=True),
         'date': fields.datetime('Date'), 
         'history': fields.boolean('Is History?'),
         'user_id': fields.many2one('res.users', 'User Responsible', readonly=True), 
diff --git a/addons/mail_gateway/mail_gateway_view.xml b/addons/mail_gateway/mail_gateway_view.xml
index 7b8ce52cbec..95dce8054c1 100644
--- a/addons/mail_gateway/mail_gateway_view.xml
+++ b/addons/mail_gateway/mail_gateway_view.xml
@@ -8,19 +8,26 @@
             <field name="arch" type="xml">
                 <form string="mailgate message">
                     <group colspan="4" col="6">
-                        <field name="name" required="1" select="1"/>
-                        <field name="date" required="1" select="1"/>
-                        <field name="user_id" string="Responsible" select="1"/>
-                    </group>
+	                    <field name="name" string="Subject" required="1" select="1"/>
+	                    <field name="date" required="1" select="1"/>
+	                    <field name="user_id" string="Responsible" select="1"/>
+	                    <field name="partner_id" readonly="1" />
+	                </group>
                     <notebook colspan="4">
-                        <page string="Details">
-                            <group col="4" colspan="4">
-                                <separator string="Email Details" colspan="4"/>
-                                <field name="email_from" />
-                                <field name="email_to" />
-                                <field name="email_cc" />
-                                <field name="email_bcc" />
-                                <field name="message_id" />
+	                    <page string="Details">
+	                    	<group col="2" colspan="2">
+	                    		<separator string="Email Details" colspan="4"/>
+			                    <field name="email_from" />
+			                    <field name="email_to" />
+			                    <field name="email_cc" />
+			                    <field name="email_bcc" groups="base.group_extended"/>
+			               </group>
+			               <group col="2" colspan="2">
+                                <separator string="Message Details" colspan="4"/>
+                                    <field name="model" readonly="1"/>
+                                    <field name="res_id"  readonly="1"/>
+                                    <field name="message_id" />
+                                    <field name="ref_id" />
                            </group>
                            <separator string="Description" colspan="4"/>
                             <field name="description" nolabel="1" colspan="4" />
@@ -41,8 +48,9 @@
             <field name="arch" type="xml">
                 <tree string="Mailgateway Message">
                     <field name="date" />
-                    <field name="email_from" />
-                    <field name="user_id" />
+                    <field name="name" string="Subject"/>
+                    <field name="email_from" string="From"/>
+                    <field name="user_id" string="Responsible"/>
                 </tree>
             </field>
         </record>
@@ -53,7 +61,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Mailgateway Message Search">
-                    <field name="name" />
+                    <field name="name" string="Subject"/>
                     <field name="date" />
                     <field name="user_id" />
                     <field name="message_id" />
@@ -144,6 +152,16 @@
             </field>
         </record>
 
+         <!--        Mailgateway message action-->
+        <record model="ir.actions.act_window" id="action_view_mailgate_message">
+            <field name="name">Mailgateway Messages</field>
+            <field name="res_model">mailgate.message</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_type">form</field>
+            <field name="domain">[('history', '=', True)]</field>
+            <field name="view_id" ref="view_mailgate_message_tree"/>
+        </record>
+        
         <record model="ir.actions.act_window" id="action_view_mailgate_thread">
             <field name="name">Mailgateway Threads</field>
             <field name="res_model">mailgate.thread</field>
@@ -151,7 +169,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_mailgate_thread_tree"/>
         </record>
-
+        
         <record model="ir.actions.act_window.view" id="action_view_mailgate_thread_view1">
             <field name="sequence" eval="1"/>
             <field name="view_mode">tree</field>
@@ -166,7 +184,7 @@
         </record>
 
         <menuitem id="base.menu_base_config_mail" name="Mail" parent="base.menu_base_config" sequence="10"/>
-        <menuitem id="menu_mailgate_thread" name="Mailgateway Threads" action="action_view_mailgate_thread"
+        <menuitem id="menu_mailgate_message" name="Mailgateway Messages" action="action_view_mailgate_message"
            parent="base.menu_base_config_mail" sequence="5"/>
 
         <act_window domain="[('partner_id', '=', active_id), ('history', '=', True)]"