diff options
| author | Antony Lesuisse <al@openerp.com> | 2012-08-18 18:49:32 +0200 |
|---|---|---|
| committer | Antony Lesuisse <al@openerp.com> | 2012-08-18 18:49:32 +0200 |
| commit | 297cff0449ddb7b7bdcbbe2bd7c8b80c5cb00a35 (patch) | |
| tree | bc87a329ecff353cf2aad001e984a9e20a924911 /addons/auth_signup | |
| parent | 6cce0bd9fc7d54602c551213429e151b53963397 (diff) | |
| parent | 4f76c4e8d9fecca6ffc091f13c40ac3eadcc742d (diff) | |
[MERGE] auth_config
bzr revid: al@openerp.com-20120818164932-tt7mpm1p5k3i5unu
Diffstat (limited to 'addons/auth_signup')
| -rw-r--r-- | addons/auth_signup/res_config.py | 3 | ||||
| -rw-r--r-- | addons/auth_signup/res_config.xml | 19 |
2 files changed, 11 insertions, 11 deletions
diff --git a/addons/auth_signup/res_config.py b/addons/auth_signup/res_config.py index a9a490de8c5..6afd1c5b581 100644 --- a/addons/auth_signup/res_config.py +++ b/addons/auth_signup/res_config.py @@ -25,7 +25,8 @@ class base_config_settings(osv.TransientModel): _inherit = 'base.config.settings' _columns = { - 'auth_signup_template_user_id': fields.many2one('res.users', 'Template user for new users created through signup') + 'auth_signup_uninvited': fields.boolean('allow public users to sign up', help="If unchecked only invited users may sign up"), + 'auth_signup_template_user_id': fields.many2one('res.users', 'Template user for new users created through signup'), } def get_default_signup(self, cr, uid, fields, context=None): diff --git a/addons/auth_signup/res_config.xml b/addons/auth_signup/res_config.xml index 3bea8dc2aed..49669d36618 100644 --- a/addons/auth_signup/res_config.xml +++ b/addons/auth_signup/res_config.xml @@ -7,16 +7,15 @@ <field name="model">base.config.settings</field> <field name="inherit_id" ref="base_setup.view_general_configuration"/> <field name="arch" type="xml"> - <xpath expr="//group[last()]" position="after"> - <group> - <label for="id" string="External Users"/> - <div> - <div> - <label for="auth_signup_template_user_id"/> - <field name="auth_signup_template_user_id" class="oe_inline"/> - </div> - </div> - </group> + <xpath expr="//field[@name='module_auth_anonymous']/.." position="after"> + <div> + <field name="auth_signup_uninvited" class="oe_inline"/> + <label for="auth_signup_uninvited"/> + </div> + <div> + <label for="auth_signup_template_user_id"/> + <field name="auth_signup_template_user_id" class="oe_inline"/> + </div> </xpath> </field> </record> |