Ravish Murari(OpenERP) has proposed merging
lp:~openerp-dev/openobject-server/trunk-usability-improve_filter-rmu into
lp:~openerp-dev/openobject-server/trunk-usability.
Requested reviews:
Amit (Open ERP) (apa-tiny)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-usability-improve_filter-rmu/+merge/69226
hello sir
I have done all ask changes..
Thanks
Ravish
--
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-usability-improve_filter-rmu/+merge/69226
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-server/trunk-usability.
=== modified file 'openerp/addons/base/ir/ir.xml'
--- openerp/addons/base/ir/ir.xml 2011-06-30 14:05:13 +0000
+++ openerp/addons/base/ir/ir.xml 2011-07-26 09:01:31 +0000
@@ -393,14 +393,20 @@
<search string="Filters">
<group colspan="4" col="10">
<field name="name"/>
- <field name="user_id"/>
+ <field name="user_id">
+ <filter icon="terp-personal"
+ domain="[('user_id','=', uid)]"
+ help="Current User" name="My Filters" />
+ </field>
<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>
- </search>
+
+ <newline/>
+ <group expand="0" string="Extended Filters..." groups="base.group_extended">
+ <field name="domain"/>
+ <field name="context"/>
+ </group>
+ </search>
</field>
</record>
=== modified file 'openerp/addons/base/ir/ir_filters.py'
--- openerp/addons/base/ir/ir_filters.py 2010-11-02 14:18:07 +0000
+++ openerp/addons/base/ir/ir_filters.py 2011-07-26 09:01:31 +0000
@@ -29,10 +29,11 @@
_name = 'ir.filters'
_description = 'Filters'
- def _list_all_models(self, cr, uid, context=None):
- cr.execute("SELECT model, name from ir_model")
- return cr.fetchall()
-
+ def copy(self, cr, uid, id, default={}, context={}):
+ name = self.read(cr, uid, [id], ['name'])[0]['name']
+ default.update({'name': name+ _(' (copy)'), 'events':[]})
+ 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,11 +57,15 @@
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='Keep empty if you want this filter to be applied to every user.If you assign a user in this field, only this user will have this filter available.'),
'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),
+ 'model_id': fields.many2one('ir.model', 'Object', size=64, required=True),
+ }
+ _defaults = {
+ 'domain': '"[]"',
+ 'context':'"{}"',
}
ir_filters()
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
