From 2e004d0741960e52fe790b50e91c4a631d0b4fb9 Mon Sep 17 00:00:00 2001 From: "RavishchanraMurari (Open ERP)" Date: Tue, 26 Jul 2011 14:22:18 +0530 Subject: [PATCH 1/3] filter management bzr revid: rmu@tinyerp.com-20110726085218-w3om75wrt0eusxw1 --- openerp/addons/base/ir/ir.xml | 18 ++++++++++++------ openerp/addons/base/ir/ir_filters.py | 19 ++++++++++++------- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml index 1280ad5f5e7..a4ab078e589 100644 --- a/openerp/addons/base/ir/ir.xml +++ b/openerp/addons/base/ir/ir.xml @@ -393,14 +393,20 @@ - + + + - - - - - + + + + + + + diff --git a/openerp/addons/base/ir/ir_filters.py b/openerp/addons/base/ir/ir_filters.py index 0146b8dd85b..c0a4977f5a0 100644 --- a/openerp/addons/base/ir/ir_filters.py +++ b/openerp/addons/base/ir/ir_filters.py @@ -29,10 +29,11 @@ class ir_filters(osv.osv): _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 @@ 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='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() From 348f4693c359b222e2c9b11ff2b7c55713606d6d Mon Sep 17 00:00:00 2001 From: "RavishchanraMurari (Open ERP)" Date: Wed, 27 Jul 2011 14:52:26 +0530 Subject: [PATCH 2/3] filter_management bzr revid: rmu@tinyerp.com-20110727092226-z6vltblzo0hh3i29 --- openerp/addons/base/ir/ir_filters.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/openerp/addons/base/ir/ir_filters.py b/openerp/addons/base/ir/ir_filters.py index c0a4977f5a0..3cffad737d8 100644 --- a/openerp/addons/base/ir/ir_filters.py +++ b/openerp/addons/base/ir/ir_filters.py @@ -29,9 +29,9 @@ class ir_filters(osv.osv): _name = 'ir.filters' _description = 'Filters' - def copy(self, cr, uid, id, default={}, context={}): + def copy(self, cr, uid, id, default=None, context=None): name = self.read(cr, uid, [id], ['name'])[0]['name'] - default.update({'name': name+ _(' (copy)'), 'events':[]}) + default.update({'name': name+ _(' (copy)')}) return super(ir_filters, self).copy(cr, uid, id, default, context) def get_filters(self, cr, uid, model): @@ -64,8 +64,8 @@ class ir_filters(osv.osv): 'model_id': fields.many2one('ir.model', 'Object', size=64, required=True), } _defaults = { - 'domain': '"[]"', - 'context':'"{}"', + 'domain': '[]', + 'context':'{}', } ir_filters() From da9f43e2781d7dfe6bab88e29a0386c504c0cfc6 Mon Sep 17 00:00:00 2001 From: "RavishchanraMurari (Open ERP)" Date: Thu, 4 Aug 2011 18:35:08 +0530 Subject: [PATCH 3/3] filter_management_resummit bzr revid: rmu@tinyerp.com-20110804130508-efncl6hfr99gyetz --- openerp/addons/base/ir/ir.xml | 14 ++++---------- openerp/addons/base/ir/ir_filters.py | 6 +++--- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml index a4ab078e589..e463569a951 100644 --- a/openerp/addons/base/ir/ir.xml +++ b/openerp/addons/base/ir/ir.xml @@ -356,7 +356,7 @@ - + @@ -377,8 +377,8 @@ - - + + @@ -395,17 +395,11 @@ - - - - - - diff --git a/openerp/addons/base/ir/ir_filters.py b/openerp/addons/base/ir/ir_filters.py index 3cffad737d8..43ad379e9d4 100644 --- a/openerp/addons/base/ir/ir_filters.py +++ b/openerp/addons/base/ir/ir_filters.py @@ -31,7 +31,7 @@ class ir_filters(osv.osv): def copy(self, cr, uid, id, default=None, context=None): name = self.read(cr, uid, [id], ['name'])[0]['name'] - default.update({'name': name+ _(' (copy)')}) + default.update({'name':_('%s (copy)') % name}) return super(ir_filters, self).copy(cr, uid, id, default, context) def get_filters(self, cr, uid, model): @@ -58,10 +58,10 @@ class ir_filters(osv.osv): _columns = { '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.'), + '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.many2one('ir.model', 'Object', size=64, required=True), + 'model_id': fields.many2one('ir.model', 'Object',required=True), } _defaults = { 'domain': '[]',