From ea87502ba4c0d7eb1f4d4f4ab39edfb5e02e5a73 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Thu, 10 May 2012 14:42:50 +0200 Subject: [PATCH 1/3] [IMP] ir.filters: move to own XML file + improve view for new filter semantics Filters assigned to NULL users will now become global/public filters and be visible by everyone bzr revid: odo@openerp.com-20120510124250-3osbynohfo09gzcy --- openerp/addons/base/ir/ir.xml | 71 --------------------------- openerp/addons/base/ir/ir_filters.xml | 67 +++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 71 deletions(-) create mode 100644 openerp/addons/base/ir/ir_filters.xml diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml index 338ef617cbd..518ea1e08d6 100644 --- a/openerp/addons/base/ir/ir.xml +++ b/openerp/addons/base/ir/ir.xml @@ -322,78 +322,7 @@ - - - ir.filters.form - ir.filters - form - -
- - - - - - - - - - - -
- - - - - - - ir.filters.tree - ir.filters - tree - - - - - - - - - - - - - - - ir.filters.search - ir.filters - search - - - - - - - - - - - - - - - Filters - ir.actions.act_window - ir.filters - form - - - - - - - ir.actions.report.xml diff --git a/openerp/addons/base/ir/ir_filters.xml b/openerp/addons/base/ir/ir_filters.xml new file mode 100644 index 00000000000..93f725e89ce --- /dev/null +++ b/openerp/addons/base/ir/ir_filters.xml @@ -0,0 +1,67 @@ + + + + + ir.filters.form + ir.filters + form + +
+ + + + + + + + + + + +
+ + + + + ir.filters.tree + ir.filters + tree + + + + + + + + + + + + + ir.filters.search + ir.filters + search + + + + + + + + + + + + + + + + Filters + ir.actions.act_window + ir.filters + + + + + \ No newline at end of file From b521325b94060fe4525ae3d308b6c115389a03c2 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Fri, 11 May 2012 11:46:54 +0200 Subject: [PATCH 2/3] [IMP] ir.filters: unassigned filters are now global bzr revid: odo@openerp.com-20120511094654-0qn0yr9yz4hbbzab --- openerp/addons/base/__openerp__.py | 1 + openerp/addons/base/ir/ir.xml | 4 +-- openerp/addons/base/ir/ir_filters.py | 42 +++++++++++++++++++-------- openerp/addons/base/ir/ir_filters.xml | 22 ++++++++++---- 4 files changed, 50 insertions(+), 19 deletions(-) diff --git a/openerp/addons/base/__openerp__.py b/openerp/addons/base/__openerp__.py index 393e7651bda..e523659397a 100644 --- a/openerp/addons/base/__openerp__.py +++ b/openerp/addons/base/__openerp__.py @@ -42,6 +42,7 @@ 'base_update.xml', 'ir/wizard/wizard_menu_view.xml', 'ir/ir.xml', + 'ir/ir_filters.xml', 'ir/ir_config_parameter_view.xml', 'ir/workflow/workflow_view.xml', 'ir/report/ir_report.xml', diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml index 518ea1e08d6..2e938c8514b 100644 --- a/openerp/addons/base/ir/ir.xml +++ b/openerp/addons/base/ir/ir.xml @@ -777,7 +777,7 @@ Views allows you to personalize each view of OpenERP. You can add new fields, move fields, rename them or delete the ones that you do not need. - + @@ -822,7 +822,7 @@ ir.ui.view.custom Customized views are used when users reorganize the content of their dashboard views (via web client) - + diff --git a/openerp/addons/base/ir/ir_filters.py b/openerp/addons/base/ir/ir_filters.py index 19b26768b10..6ee67667ebe 100644 --- a/openerp/addons/base/ir/ir_filters.py +++ b/openerp/addons/base/ir/ir_filters.py @@ -37,35 +37,53 @@ class ir_filters(osv.osv): 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']) + """Obtain the list of filters available for the user on the given model. + + :return: list of :meth:`~osv.read`-like dicts containing the ``name``, + ``domain``, ``user_id`` (m2o tuple) and ``context`` of the matching ``ir.filters``. + """ + # available filters: private filters (user_id=uid) and public filters (uid=NULL) + act_ids = self.search(cr, uid, [('model_id','=',model),('user_id','in',[uid, False])]) + my_acts = self.read(cr, uid, act_ids, ['name', 'domain', 'context', 'user_id']) return my_acts def create_or_replace(self, cr, uid, vals, context=None): - filter_id = None lower_name = vals['name'].lower() - matching_filters = [x for x in self.get_filters(cr, uid, vals['model_id']) - if x['name'].lower() == lower_name] + matching_filters = [f for f in self.get_filters(cr, uid, vals['model_id']) + if f['name'].lower() == lower_name + if (f['user_id'] and f['user_id'][0]) == vals.get('user_id', False)] + # When a filter exists for the same (name, model, user) triple, we simply + # replace its definition. if matching_filters: self.write(cr, uid, matching_filters[0]['id'], vals, context) - return False + return matching_filters[0]['id'] return self.create(cr, uid, vals, context) + _sql_constraints = [ + # Partial constraint, complemented by unique index (see below) + # Still useful to keep because it provides a proper error message when a violation + # occurs, as it shares the same prefix as the unique index. + ('name_model_uid_unique', 'unique (name, model_id, user_id)', 'Filter names must be unique'), + ] + def _auto_init(self, cr, context=None): super(ir_filters, self)._auto_init(cr, context) # Use unique index to implement unique constraint on the lowercase name (not possible using a constraint) cr.execute("SELECT indexname FROM pg_indexes WHERE indexname = 'ir_filters_name_model_uid_unique_index'") if not cr.fetchone(): - cr.execute('CREATE UNIQUE INDEX "ir_filters_name_model_uid_unique_index" ON ir_filters (lower(name), model_id, user_id)') + cr.execute("""CREATE UNIQUE INDEX "ir_filters_name_model_uid_unique_index" ON ir_filters + (lower(name), model_id, COALESCE(user_id,-1))""") _columns = { '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. When left empty the filter is usable by the system only."), - '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), + 'user_id': fields.many2one('res.users', 'User', ondelete='cascade', + help="The user this filter is private to. When left empty the filter is public " + "and available to all users."), + 'domain': fields.text('Domain', required=True), + 'context': fields.text('Context', required=True), + 'model_id': fields.selection(_list_all_models, 'Model', required=True), } _defaults = { 'domain': '[]', diff --git a/openerp/addons/base/ir/ir_filters.xml b/openerp/addons/base/ir/ir_filters.xml index 93f725e89ce..a0e37b45e5a 100644 --- a/openerp/addons/base/ir/ir_filters.xml +++ b/openerp/addons/base/ir/ir_filters.xml @@ -1,5 +1,15 @@ + + + + + ir.filters.owner + + [('user_id','in',[False,user.id])] + + + ir.filters.form @@ -43,13 +53,15 @@ search - - + + - + @@ -61,7 +73,7 @@ ir.filters - + \ No newline at end of file From 3a4ebf326618ae30ede150aba0e322ec018a7820 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Wed, 16 May 2012 18:31:22 +0200 Subject: [PATCH 3/3] [IMP] ir.filters: default user_id = uid ; comment about cryptic code (Some minor updates after XMO's review) bzr revid: odo@openerp.com-20120516163122-jsb3n2eo2i253o00 --- openerp/addons/base/ir/ir_filters.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/openerp/addons/base/ir/ir_filters.py b/openerp/addons/base/ir/ir_filters.py index 6ee67667ebe..02a723c116c 100644 --- a/openerp/addons/base/ir/ir_filters.py +++ b/openerp/addons/base/ir/ir_filters.py @@ -53,6 +53,9 @@ class ir_filters(osv.osv): lower_name = vals['name'].lower() matching_filters = [f for f in self.get_filters(cr, uid, vals['model_id']) if f['name'].lower() == lower_name + # next line looks for matching user_ids (specific or global), i.e. + # f.user_id is False and vals.user_id is False or missing, + # or f.user_id.id == vals.user_id if (f['user_id'] and f['user_id'][0]) == vals.get('user_id', False)] # When a filter exists for the same (name, model, user) triple, we simply # replace its definition. @@ -88,6 +91,7 @@ class ir_filters(osv.osv): _defaults = { 'domain': '[]', 'context':'{}', + 'user_id': lambda self,cr,uid,context=None: uid, } ir_filters()