pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[REV] message_state: reverted changes and deleted message_state field from mail.thread. This will be added with another task.

Browse Source 
bzr revid: tde@openerp.com-20120531090542-p3w1p1bqtx5jzjht
This commit is contained in:
Thibault Delavallée
2012-05-31 11:05:42 +02:00
parent 4ce48b4440
commit 154e9072af
8 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/crm/crm_lead_view.xml
-1
View File
@@ -303,7 +303,6 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Leads">
<filter icon="terp-check" name="inbox" string="Inbox" domain="[('message_state','=','unread')]"/>
<filter icon="terp-check"
string="New"
name="new" help="New Leads"
addons/hr_recruitment/hr_recruitment_view.xml
-1
View File
@@ -185,7 +185,6 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Jobs">
<filter icon="terp-check" name="inbox" string="Inbox" domain="[('message_state','=','unread')]"/>
<filter icon="terp-document-new" string="New" name="filter_new"
domain="[('state','=','draft')]"
help="All Initial Jobs"
addons/mail/mail_message.py
-4
View File
@@ -520,10 +520,6 @@ class mail_message(osv.osv):
:param browse_record message: the message that was just sent
:return: True
"""
if context is None:
context = {}
if context.get('active_ids', False) and context.get('active_model', False):
self.pool.get(context['active_model']).write(cr, uid, context['active_ids'], {'message_state':'read'}, context=context)
if message.auto_delete:
self.pool.get('ir.attachment').unlink(cr, uid,
[x.id for x in message.attachment_ids \
addons/mail/mail_message_view.xml
+4 -1
View File
@@ -167,6 +167,9 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Email Search">
<filter icon="terp-camera_test" name="received" string="Received" domain="[('state','=','received')]"/>
<filter icon="terp-call-start" name="outgoing" string="Outgoing" domain="[('state','=','outgoing')]"/>
<filter icon="terp-check" name="sent" string="Sent" domain="[('state','=','sent')]"/>
<separator orientation="vertical"/>
<filter icon="terp-gtk-stop" name="exception" string="Failed" domain="[('state','=','exception')]"/>
<separator orientation="vertical"/>
@@ -213,7 +216,7 @@
<field name="res_model">mail.message</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="context">{'search_default_type_email': 1}</field>
<field name="context">{'search_default_received': 1, 'search_default_type_email': 1}</field>
<field name="search_view_id" ref="view_email_message_search"/>
</record>
addons/mail/mail_thread.py
-3
View File
@@ -72,7 +72,6 @@ class mail_thread(osv.osv):
_columns = {
'message_ids_social': fields.function(_get_message_ids, method=True,
type='one2many', obj='mail.message', string='Temp messages', _fields_id = 'res_id'),
'message_state': fields.selection([('read', 'Read'),('unread', 'Unread')], 'Message State'),
}
#------------------------------------------------------
@@ -570,7 +569,6 @@ class mail_thread(osv.osv):
data.update(custom_values)
res_id = model_pool.create(cr, uid, data, context=context)
self.message_append_dict(cr, uid, [res_id], msg_dict, context=context)
self.write(cr, uid, [res_id], {'message_state':'unread'}, context=context)
return res_id
def message_update(self, cr, uid, ids, msg_dict, vals={}, default_act=None, context=None):
@@ -589,7 +587,6 @@ class mail_thread(osv.osv):
to determine the model of the thread to
update (instead of the current model).
"""
self.write(cr, uid, ids, {'message_state':'unread'}, context=context)
return self.message_append_dict(cr, uid, ids, msg_dict, context=context)
def message_thread_followers(self, cr, uid, ids, context=None):
addons/project/project_view.xml
-1
View File
@@ -579,7 +579,6 @@
<field name="arch" type="xml">
<search string="Tasks">
<group>
<filter icon="terp-check" name="inbox" string="Inbox" domain="[('message_state','=','unread')]"/>
<filter name="draft" string="New" domain="[('state','=','draft')]" help="New Tasks" icon="terp-check"/>
<filter name="open" string="In Progress" domain="[('state','=','open')]" help="In Progress Tasks" icon="terp-camera_test"/>
<filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
addons/project_issue/project_issue.py
-2
View File
@@ -508,7 +508,6 @@ class project_issue(base_stage, osv.osv):
vals.update(custom_values)
res_id = self.create(cr, uid, vals, context)
self.write(cr, uid, [res_id], {'message_state':'unread'}, context=context)
self.message_append_dict(cr, uid, [res_id], msg, context=context)
self.convert_to_bug(cr, uid, [res_id], context=context)
return res_id
@@ -547,7 +546,6 @@ class project_issue(base_stage, osv.osv):
vals.update(vls)
res = self.write(cr, uid, ids, vals)
self.write(cr, uid, ids, {'message_state':'unread'}, context=context)
self.message_append_dict(cr, uid, ids, msg, context=context)
return res
addons/project_issue/project_issue_view.xml
-1
View File
@@ -171,7 +171,6 @@
<field name="arch" type="xml">
<search string="Issue Tracker Search">
<group>
<filter icon="terp-check" name="inbox" string="Inbox" domain="[('message_state','=','unread')]"/>
<filter string="New" icon="terp-document-new" name="draft" domain="[('state','=','draft')]" help="New Issues"/>
<filter string="To Do" name="todo" domain="[('state','=','open')]" help="To Do Issues" icon="terp-check"/>
<filter string="Pending" domain="[('state','=','pending')]" help="Pending Issues" icon="terp-gtk-media-pause"/>