diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-09-14 16:18:06 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-09-14 16:18:06 +0200 |
| commit | f910cf4e722a7daa75488ab3701fedcd2d1c49b9 (patch) | |
| tree | 6beafa74cd5f33fa0c0a6b1e2c74c4636dc4b80d /addons/auth_oauth | |
| parent | 994441ae4a2af6d55248d431682ce64cd943e2a8 (diff) | |
| parent | 53bd6a6c582b1e162b1156832e353a74d672fb9c (diff) | |
[MERGE] Merged with addons/trunk, except access rules for mail_mail.
bzr revid: tde@openerp.com-20120914141806-lprl9h4eaa4d4bvk
Diffstat (limited to 'addons/auth_oauth')
| -rw-r--r-- | addons/auth_oauth/__openerp__.py | 3 | ||||
| -rw-r--r-- | addons/auth_oauth/auth_oauth_view.xml | 2 | ||||
| -rw-r--r-- | addons/auth_oauth/security/ir.model.access.csv | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/addons/auth_oauth/__openerp__.py b/addons/auth_oauth/__openerp__.py index f0be1234721..d43815e8018 100644 --- a/addons/auth_oauth/__openerp__.py +++ b/addons/auth_oauth/__openerp__.py @@ -34,7 +34,8 @@ Allow users to login through Google OAuth2. 'depends': ['base', 'web', 'base_setup'], 'data': [ 'auth_oauth_data.xml', - 'auth_oauth_view.xml' + 'auth_oauth_view.xml', + 'security/ir.model.access.csv' ], 'js': ['static/src/js/auth_oauth.js'], 'css': ['static/lib/zocial/css/zocial.css'], diff --git a/addons/auth_oauth/auth_oauth_view.xml b/addons/auth_oauth/auth_oauth_view.xml index 475720af9fd..35397d72dbd 100644 --- a/addons/auth_oauth/auth_oauth_view.xml +++ b/addons/auth_oauth/auth_oauth_view.xml @@ -4,7 +4,6 @@ <record model="ir.ui.view" id="view_oauth_provider_form"> <field name="name">auth.oauth.provider.form</field> <field name="model">auth.oauth.provider</field> - <field name="type">form</field> <field name="arch" type="xml"> <form string="arch" version="7.0"> <sheet> @@ -26,7 +25,6 @@ <record model="ir.ui.view" id="view_oauth_provider_list"> <field name="name">auth.oauth.provider.list</field> <field name="model">auth.oauth.provider</field> - <field name="type">tree</field> <field name="arch" type="xml"> <tree string="arch" version="7.0"> <field name="name" /> diff --git a/addons/auth_oauth/security/ir.model.access.csv b/addons/auth_oauth/security/ir.model.access.csv new file mode 100644 index 00000000000..65fd2f54bbf --- /dev/null +++ b/addons/auth_oauth/security/ir.model.access.csv @@ -0,0 +1,2 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_auth_oauth_provider,auth_oauth_provider,model_auth_oauth_provider,base.group_system,1,1,1,1 |
