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

[MERGE] trunk-usability-improve_filter-rmu

Browse Source 
bzr revid: al@openerp.com-20110806005046-4w8w2rnapbw5wbx1
This commit is contained in:
Antony Lesuisse
2011-08-06 02:50:46 +02:00
parent 17e2f04cb7 da9f43e278
commit bcc1d99808
2 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openerp/addons/base/ir/ir.xml
+8 -12
View File
@@ -375,10 +375,10 @@
<field name="arch" type="xml">
<tree string="Filters">
<field name="name"/>
<field name="user_id"/>
<field name="model_id"/>
<field name="domain"/>
<field name="context"/>
<field name="user_id"/>
<field name="domain" groups="base.group_extended"/>
<field name="context" groups="base.group_extended"/>
</tree>
</field>
</record>
@@ -391,15 +391,11 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Filters">
<group colspan="4" col="10">
<field name="name"/>
<field name="user_id"/>
<field name="model_id"/>
</group>
<newline/>
<group expand="0" string="Group By" colspan="4">
<filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
</group>
<field name="name"/>
<field name="model_id"/>
<field name="user_id">
<filter icon="terp-personal" domain="[('user_id','in', (uid, False))]" help="Current User" name="My Filters" />
</field>
</search>
</field>
</record>
openerp/addons/base/ir/ir_filters.py
+11 -2
View File
@@ -33,6 +33,11 @@ class ir_filters(osv.osv):
cr.execute("SELECT model, name from ir_model")
return cr.fetchall()
def copy(self, cr, uid, id, default=None, context=None):
name = self.read(cr, uid, [id], ['name'])[0]['name']
default.update({'name':_('%s (copy)') % name})
return super(ir_filters, self).copy(cr, uid, id, default, context)
def get_filters(self, cr, uid, model):
act_ids = self.search(cr,uid,[('model_id','=',model),('user_id','=',uid)])
my_acts = self.read(cr, uid, act_ids, ['name', 'domain','context'])
@@ -56,12 +61,16 @@ class ir_filters(osv.osv):
cr.execute('CREATE UNIQUE INDEX "ir_filters_name_model_uid_unique_index" ON ir_filters (lower(name), model_id, user_id)')
_columns = {
'name': fields.char('Action Name', size=64, translate=True, required=True),
'user_id':fields.many2one('res.users', 'User', help='False means for every user'),
'name': fields.char('Filter Name', size=64, translate=True, required=True),
'user_id':fields.many2one('res.users', 'User', help="The user this filter is available to. Keep empty to make it available to all users."),
'domain': fields.text('Domain Value', required=True),
'context': fields.text('Context Value', required=True),
'model_id': fields.selection(_list_all_models, 'Object', size=64, required=True),
}
_defaults = {
'domain': '[]',
'context':'{}',
}
ir_filters()