[REF] Removed res.log.
bzr revid: tde@openerp.com-20120403152949-tw1mphjf2tia4q9a
This commit is contained in:
Thibault Delavallée
parent
e12dff66de
commit
741381eb21
|
|
@ -58,7 +58,6 @@
|
|||
'module/wizard/base_update_translations_view.xml',
|
||||
'res/res_request_view.xml',
|
||||
'res/res_lang_view.xml',
|
||||
'res/res_log_view.xml',
|
||||
'res/res_partner_report.xml',
|
||||
'res/res_partner_view.xml',
|
||||
'res/res_partner_shortcut_data.xml',
|
||||
|
|
|
|||
|
|
@ -188,21 +188,21 @@ class publisher_warranty_contract(osv.osv):
|
|||
|
||||
limit_date = (datetime.datetime.now() - _PREVIOUS_LOG_CHECK).strftime(misc.DEFAULT_SERVER_DATETIME_FORMAT)
|
||||
# TODO: must be updated with OpenChatter ?
|
||||
for message in result["messages"]:
|
||||
ids = self.pool.get("res.log").search(cr, uid, [("res_model", "=", "publisher_warranty.contract"),
|
||||
("create_date", ">=", limit_date),
|
||||
("name", "=", message)])
|
||||
if ids:
|
||||
continue
|
||||
self.pool.get('res.log').create(cr, uid,
|
||||
{
|
||||
'name': message,
|
||||
'res_model': "publisher_warranty.contract",
|
||||
"read": True,
|
||||
"user_id": False,
|
||||
},
|
||||
context=context
|
||||
)
|
||||
#for message in result["messages"]:
|
||||
#ids = self.pool.get("res.log").search(cr, uid, [("res_model", "=", "publisher_warranty.contract"),
|
||||
#("create_date", ">=", limit_date),
|
||||
#("name", "=", message)])
|
||||
#if ids:
|
||||
#continue
|
||||
#self.pool.get('res.log').create(cr, uid,
|
||||
#{
|
||||
#'name': message,
|
||||
#'res_model': "publisher_warranty.contract",
|
||||
#"read": True,
|
||||
#"user_id": False,
|
||||
#},
|
||||
#context=context
|
||||
#)
|
||||
except Exception:
|
||||
if cron_mode:
|
||||
return False # we don't want to see any stack trace in cron
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@ import res_company
|
|||
import res_users
|
||||
import res_request
|
||||
import res_lang
|
||||
import res_log
|
||||
import res_widget
|
||||
import ir_property
|
||||
|
||||
|
|
|
|||
|
|
@ -1,80 +0,0 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
##############################################################################
|
||||
#
|
||||
# OpenERP, Open Source Management Solution
|
||||
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Affero General Public License as
|
||||
# published by the Free Software Foundation, either version 3 of the
|
||||
# License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU Affero General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
##############################################################################
|
||||
|
||||
from osv import fields, osv
|
||||
|
||||
class res_log(osv.osv):
|
||||
_name = 'res.log'
|
||||
_columns = {
|
||||
'name': fields.char('Message', size=250, help='The logging message.', required=True, select=1),
|
||||
'user_id': fields.many2one('res.users','User'),
|
||||
'res_model': fields.char('Object', size=128, select=1),
|
||||
'context': fields.char('Context', size=250),
|
||||
'res_id': fields.integer('Object ID'),
|
||||
'secondary': fields.boolean('Secondary Log', help='Do not display this log if it belongs to the same object the user is working on'),
|
||||
'create_date': fields.datetime('Creation Date', readonly=True, select=1),
|
||||
'read': fields.boolean('Read', help="If this log item has been read, get() should not send it to the client"),
|
||||
}
|
||||
_defaults = {
|
||||
'user_id': lambda self,cr,uid,ctx: uid,
|
||||
'context': "{}",
|
||||
'read': False,
|
||||
}
|
||||
_order='create_date desc'
|
||||
|
||||
_index_name = 'res_log_uid_read'
|
||||
def _auto_init(self, cr, context=None):
|
||||
super(res_log, self)._auto_init(cr, context)
|
||||
cr.execute('SELECT 1 FROM pg_indexes WHERE indexname=%s',
|
||||
(self._index_name,))
|
||||
if not cr.fetchone():
|
||||
cr.execute('CREATE INDEX %s ON res_log (user_id, read)' %
|
||||
self._index_name)
|
||||
|
||||
def create(self, cr, uid, vals, context=None):
|
||||
create_context = context and dict(context) or {}
|
||||
if 'res_log_read' in create_context:
|
||||
vals['read'] = create_context.pop('res_log_read')
|
||||
if create_context and not vals.get('context'):
|
||||
vals['context'] = create_context
|
||||
return super(res_log, self).create(cr, uid, vals, context=context)
|
||||
|
||||
# TODO: do not return secondary log if same object than in the model (but unlink it)
|
||||
def get(self, cr, uid, context=None):
|
||||
unread_log_ids = self.search(cr, uid,
|
||||
[('user_id','=',uid), ('read', '=', False)], context=context)
|
||||
res = self.read(cr, uid, unread_log_ids,
|
||||
['name','res_model','res_id','context'],
|
||||
context=context)
|
||||
res.reverse()
|
||||
result = []
|
||||
res_dict = {}
|
||||
for r in res:
|
||||
t = (r['res_model'], r['res_id'])
|
||||
if t not in res_dict:
|
||||
res_dict[t] = True
|
||||
result.insert(0,r)
|
||||
self.write(cr, uid, unread_log_ids, {'read': True}, context=context)
|
||||
return result
|
||||
|
||||
res_log()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
@ -1,65 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<openerp>
|
||||
<data>
|
||||
<record id="res_log_search" model="ir.ui.view">
|
||||
<field name="name">res.log.search</field>
|
||||
<field name="model">res.log</field>
|
||||
<field name="type">search</field>
|
||||
<field name="arch" type="xml">
|
||||
<search string="Logs">
|
||||
<filter icon="terp-camera_test" string="Read" domain="[('read','=',True)]" name="read"/>
|
||||
<filter icon="terp-gtk-jump-to-ltr" string="Unread" domain="[('read','<>',True)]" name="unread"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter icon="terp-personal" string="My Logs" domain="[('user_id','=',uid)]" name="my"/>
|
||||
<filter icon="terp-stock_align_left_24" string="System Logs"
|
||||
domain="[('res_model','=','publisher_warranty.contract')]" name="sys"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="name"/>
|
||||
<field name="user_id"/>
|
||||
<field name="res_model"/>
|
||||
<field name="create_date"/>
|
||||
</search>
|
||||
</field>
|
||||
</record>
|
||||
<record id="res_log_tree" model="ir.ui.view">
|
||||
<field name="name">res.log.tree</field>
|
||||
<field name="model">res.log</field>
|
||||
<field name="type">tree</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Logs">
|
||||
<field name="create_date"/>
|
||||
<field name="user_id"/>
|
||||
<field name="name"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
<record id="res_log_form" model="ir.ui.view">
|
||||
<field name="name">res.log.form</field>
|
||||
<field name="model">res.log</field>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Logs">
|
||||
<group colspan="4" col="6">
|
||||
<field name="name"/>
|
||||
<field name="create_date"/>
|
||||
<field name="read"/>
|
||||
<field name="user_id" />
|
||||
<field name="res_model"/>
|
||||
<field name="res_id"/>
|
||||
</group>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="res_log_act_window" model="ir.actions.act_window">
|
||||
<field name="name">Client Logs</field>
|
||||
<field name="res_model">res.log</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="context">{'search_default_my': 1}</field>
|
||||
</record>
|
||||
<menuitem
|
||||
action="res_log_act_window"
|
||||
id="menu_res_log_act_window"
|
||||
parent="base.menu_audit"/>
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
@ -117,7 +117,6 @@
|
|||
"access_ir_filters","ir_filters_all","model_ir_filters",,1,1,1,1
|
||||
"access_res_widget","res.widget","model_res_widget","group_erp_manager",1,1,1,1
|
||||
"access_res_widget_user","res.widget.user","model_res_widget",,1,0,0,0
|
||||
"access_res_log_all","res.log","model_res_log",,1,1,1,1
|
||||
"access_ir_config_parameter","ir_config_parameter","model_ir_config_parameter",,1,0,0,0
|
||||
"access_ir_mail_server_all","ir_mail_server","model_ir_mail_server",,1,0,0,0
|
||||
"access_ir_actions_todo_category","ir_actions_todo_category","model_ir_actions_todo_category","group_system",1,1,1,1
|
||||
|
|
|
|||
|
Loading…
Reference in New Issue