odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[Fix] audittrail: Fix the bug of _last_update field and read log, 

[ADD] add the search view audittrail rule

bzr revid: sbh@tinyerp.com-20101123091113-fp0c010wc5anw4ru
This commit is contained in:
sbh (Open ERP) 2010-11-23 14:41:13 +05:30
parent 89f914379f
commit 863f6a06b0
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/audittrail/audittrail.py
View File

@ -198,6 +198,8 @@ class audittrail_objects_proxy(osv_pool):
"""
if not context:
context = {}
if field_name in('__last_update','id'):
return values
pool = pooler.get_pool(cr.dbname)
field_pool = pool.get('ir.model.fields')
model_pool = pool.get('ir.model')
@ -248,6 +250,8 @@ class audittrail_objects_proxy(osv_pool):
log_line_pool = pool.get('audittrail.log.line')
#start Loop
for line in lines:
if line['name'] in('__last_update','id'):
continue
if obj_pool._inherits:
inherits_ids = model_pool.search(cr, uid, [('model', '=', obj_pool._inherits.keys()[0])])
field_ids = field_pool.search(cr, uid, [('name', '=', line['name']), ('model_id', 'in', (model.id, inherits_ids[0]))])
@ -279,6 +283,7 @@ class audittrail_objects_proxy(osv_pool):
"field_description": field['field_description']
}
line_id = log_line_pool.create(cr, uid, vals)
cr.commit()
#End Loop
return True

31
addons/audittrail/audittrail_view.xml
View File

@ -23,9 +23,9 @@
<field name="action_id" colspan="4" readonly="1" groups="base.group_extended"/>
<field name="state" select="1" readonly="1" />
<group colspan="2" col="2">
<button string="Subscribe" name="subscribe"
<button string="_Subscribe" name="subscribe" icon="gtk-ok"
type="object" states="draft" />
<button string="UnSubscribe" name="unsubscribe"
<button string="UnSubscribe" name="unsubscribe" icon="gtk-cancel"
type="object" states="subscribed" />
</group>
</form>
@ -40,18 +40,36 @@
<tree colors="blue:state in ('draft');black:state in ('subscribed')" string="AuditTrail Rules">
<field name="name" />
<field name="object_id"/>
<field name="user_id" />
<field name="log_read" />
<field name="log_write" />
<field name="log_unlink" />
<field name="log_create" />
<field name="log_action"/>
<field name="log_action"/>
<field name="log_workflow"/>
<field name="state" />
</tree>
</field>
</record>
<record id="view_audittrail_rule_search" model="ir.ui.view">
<field name="name">audittrail.rule.search</field>
<field name="model">audittrail.rule</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Audittrail Rule">
<group col='10' colspan='4'>
<filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" />
<filter icon="terp-camera_test" string="Subscribed" domain="[('state','=','subscribed')]" help="Audittrail Subscribed Rule"/>
<separator orientation="vertical"/>
<field name="name"/>
<field name="object_id"/>
</group>
<newline/>
<group expand="0" string="Group By..." colspan="4" col="10" groups="base.group_extended">
<filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
</group>
</search>
</field>
</record>
<!-- Action for audittrail rule -->
<record model="ir.actions.act_window" id="action_audittrail_rule_tree">
@ -60,7 +78,8 @@
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<!--<field name="view_id" ref="view_audittrail_rule_form" />-->
<field name="context">{'search_default_draft': 1}</field>
<field name="search_view_id" ref="view_audittrail_rule_search"/>
</record>
<menuitem name="Rules" id="menu_action_audittrail_rule_tree"