diff options
| author | Antonin Bourguignon <abo@openerp.com> | 2012-06-19 16:37:52 +0200 |
|---|---|---|
| committer | Antonin Bourguignon <abo@openerp.com> | 2012-06-19 16:37:52 +0200 |
| commit | da0fcfc19fa512e1e1eb2bdaa78a2507abc82a7a (patch) | |
| tree | 61b33a46e4cd33ccf0cf4b50987cf68a3efb30ff /addons/share | |
| parent | 3ebcb195d0ba17f0348dd3f23083b4358738ae3a (diff) | |
| parent | c9c27a2432dca8a23656659b07dbe77382307500 (diff) | |
[MERGE] latest trunk
bzr revid: abo@openerp.com-20120619143752-29v97mmr7xcttj9o
Diffstat (limited to 'addons/share')
| -rw-r--r-- | addons/share/__openerp__.py | 1 | ||||
| -rw-r--r-- | addons/share/ir_model.py | 18 | ||||
| -rw-r--r-- | addons/share/res_users_view.xml | 7 | ||||
| -rw-r--r-- | addons/share/share_view.xml | 16 |
4 files changed, 14 insertions, 28 deletions
diff --git a/addons/share/__openerp__.py b/addons/share/__openerp__.py index 608c41a4909..8b997e2357e 100644 --- a/addons/share/__openerp__.py +++ b/addons/share/__openerp__.py @@ -46,7 +46,6 @@ synchronization with other companies, etc. 'demo_xml': ['share_demo.xml'], 'data': [ 'security/share_security.xml', - 'share_view.xml', 'res_users_view.xml', 'wizard/share_wizard_view.xml' ], diff --git a/addons/share/ir_model.py b/addons/share/ir_model.py index 0927462b5c3..008dd424fa5 100644 --- a/addons/share/ir_model.py +++ b/addons/share/ir_model.py @@ -2,7 +2,7 @@ ############################################################################## # # OpenERP, Open Source Management Solution -# Copyright (C) 2004-2011 OpenERP S.A. (<http://www.openerp.com>). +# Copyright (C) 2010-2012 OpenERP S.A. (<http://www.openerp.com>). # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -18,9 +18,9 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # ############################################################################## -from osv import fields, osv +from openerp.osv import osv -class ir_model_access(osv.osv): +class ir_model_access(osv.Model): _inherit = 'ir.model.access' # overload group_names_with_access() to avoid returning sharing groups @@ -32,17 +32,17 @@ class ir_model_access(osv.osv): """ assert access_mode in ['read','write','create','unlink'], 'Invalid access mode: %s' % access_mode cr.execute('''SELECT - g.name + c.name, g.name FROM - ir_model_access a - JOIN ir_model m ON (a.model_id=m.id) + ir_model_access a + JOIN ir_model m ON (a.model_id=m.id) JOIN res_groups g ON (a.group_id=g.id) + LEFT JOIN ir_module_category c ON (c.id=g.category_id) WHERE m.model=%s AND (g.share IS NULL or g.share IS false) AND a.perm_''' + access_mode, (model_name,)) - return [x[0] for x in cr.fetchall()] - -ir_model_access() + return [('%s/%s' % x) if x[0] else x[1] for x in cr.fetchall()] + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/share/res_users_view.xml b/addons/share/res_users_view.xml index 3b74fbb4dbc..52e154c1667 100644 --- a/addons/share/res_users_view.xml +++ b/addons/share/res_users_view.xml @@ -49,9 +49,12 @@ <field name="type">form</field> <field name="inherit_id" ref="base.view_groups_form"/> <field name="arch" type="xml"> - <xpath expr="/form/notebook/page//field[@name='users']" position="attributes"> + <field name="users" position="attributes"> <attribute name="context">{'search_default_no_share':1}</attribute> - </xpath> + </field> + <field name="name" position="after"> + <field name="share"/> + </field> </field> </record> </data> diff --git a/addons/share/share_view.xml b/addons/share/share_view.xml deleted file mode 100644 index 315f750a7f6..00000000000 --- a/addons/share/share_view.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<openerp> - <data> - <record id="view_groups_form" model="ir.ui.view"> - <field name="name">res.groups.form</field> - <field name="model">res.groups</field> - <field name="type">form</field> - <field name="inherit_id" ref="base.view_groups_form"/> - <field name="arch" type="xml"> - <field name="name" position="after"> - <field name="share"/> - </field> - </field> - </record> - </data> -</openerp> |