From 1f9d21552b47b2c326dbeb2a7f1a2b946e8a8297 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 2 Sep 2013 15:56:01 +0200
Subject: [PATCH] Re-enabled history of live chat

bzr revid: nicolas.vanhoren@openerp.com-20130902135601-4hyeq0y1l1icgpno
---
 addons/im/im.py                                      | 8 ++++++++
 addons/im_livechat/im_livechat_view.xml              | 9 +++------
 addons/im_livechat/security/im_livechat_security.xml | 4 +---
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/addons/im/im.py b/addons/im/im.py
index ce31c24f969..c47d0d9be7e 100644
--- a/addons/im/im.py
+++ b/addons/im/im.py
@@ -193,8 +193,16 @@ class im_message(osv.osv):
 
 class im_session(osv.osv):
     _name = 'im.session'
+
+    def _calc_name(self, cr, uid, ids, something, something_else, context=None):
+        res = {}
+        for obj in self.browse(cr, uid, ids, context=context):
+            res[obj.id] = ", ".join([x.name for x in obj.user_ids])
+        return res
+
     _columns = {
         'user_ids': fields.many2many('im.user'),
+        "name": fields.function(_calc_name, string="Name", type='char'),
     }
 
     # Todo: reuse existing sessions if possible
diff --git a/addons/im_livechat/im_livechat_view.xml b/addons/im_livechat/im_livechat_view.xml
index a5e3de898ae..1fccc1b301c 100644
--- a/addons/im_livechat/im_livechat_view.xml
+++ b/addons/im_livechat/im_livechat_view.xml
@@ -120,12 +120,11 @@
             </field>
         </record>
 
-        <!--
         <record model="ir.actions.act_window" id="action_history">
             <field name="name">History</field>
             <field name="res_model">im.message</field>
             <field name="view_mode">list</field>
-            <field name="domain">["|", ('to_id.user_id', '=', None), ('from_id.user_id', '=', None)]</field>
+            <field name="domain">[('session_id.channel_id', '!=', None)]</field>
         </record>
         <menuitem name="History" parent="im_livechat" id="history" action="action_history" groups="group_im_livechat_manager"/>
 
@@ -134,15 +133,13 @@
             <field name="model">im.message</field>
             <field name="arch" type="xml">
                 <tree string="History">
+                    <field name="session_id"/>
                     <field name="date"/>
-                    <field name="support_member_id"/>
-                    <field name="customer_id"/>
-                    <field name="direction"/>
+                    <field name="from_id"/>
                     <field name="message"/>
                 </tree>
             </field>
         </record>
-    -->
 
     </data>
 </openerp>
diff --git a/addons/im_livechat/security/im_livechat_security.xml b/addons/im_livechat/security/im_livechat_security.xml
index b7185584394..b93798f96a9 100644
--- a/addons/im_livechat/security/im_livechat_security.xml
+++ b/addons/im_livechat/security/im_livechat_security.xml
@@ -21,18 +21,16 @@
             <field name="users" eval="[(4, ref('base.user_root'))]"/>
         </record>
 
-        <!--
         <record id="message_rule_1" model="ir.rule">
             <field name="name">Live Support Managers can read messages from live support</field>
             <field name="model_id" ref="im.model_im_message"/>
             <field name="groups" eval="[(6,0,[ref('im_livechat.group_im_livechat_manager')])]"/>
-            <field name="domain_force">["|", ('to_id.user_id', '=', None), ('from_id.user_id', '=', None)]</field>
+            <field name="domain_force">[('session_id.channel_id', '!=', None)]</field>
             <field name="perm_unlink" eval="0"/>
             <field name="perm_write" eval="0"/>
             <field name="perm_read" eval="1"/>
             <field name="perm_create" eval="0"/>
         </record>
-        -->
 
     </data>
 </openerp>