[IMP] move the template user in the auth_signup module, and fix the default methods

bzr revid: abo@openerp.com-20120828163657-x4l6bhebwdq0kslp
This commit is contained in:
Antonin Bourguignon 2012-08-28 18:36:57 +02:00
parent 978611cd99
commit aaa01ab8c4
4 changed files with 30 additions and 26 deletions

View File

@ -31,7 +31,10 @@ Allow users to sign up.
'website': 'http://www.openerp.com',
'installable': True,
'depends': ['base_setup'],
'data': ['res_config.xml'],
'data': [
'auth_signup_data.xml',
'res_config.xml',
],
'js': ['static/src/js/auth_signup.js'],
'qweb': ['static/src/xml/auth_signup.xml'],
}

View File

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<openerp>
<data noupdate="1">
<!-- Default template user for new users signing in -->
<record id="default_template_user" model="res.users">
<field name="name">Template User</field>
<field name="login">portaltemplate</field>
<!-- No password: this template user doesn't need to log in -->
<field name="password"></field>
<field name="active" eval="False"/>
<!-- Avoid auto-including this user in any default group, just like a typical portal member -->
<field name="groups_id" eval="[(5,)]"/>
</record>
<record model="ir.config_parameter" id="blabla">
<field name="key">auth.signup_template_user_id</field>
<field name="value" ref="default_template_user"/>
</record>
</data>
</openerp>

View File

@ -29,24 +29,13 @@ class base_config_settings(osv.TransientModel):
'auth_signup_template_user_id': fields.many2one('res.users', 'Template user for new users created through signup'),
}
#todo: @al, @chs: what is this method for ?
def get_default_signup(self, cr, uid, fields, context=None):
def get_default_auth_signup_template_user_id(self, cr, uid, fields, context=None):
icp = self.pool.get('ir.config_parameter')
return {
'auth_signup_template_user_id': icp.get_param(cr, uid, 'auth.signup_template_user_id', 0) or False
}
#todo: @al, @chs: what is this method for ?
def set_signup(self, cr, uid, ids, context=None):
def set_auth_signup_template_user_id(self, cr, uid, ids, context=None):
config = self.browse(cr, uid, ids[0], context=context)
icp = self.pool.get('ir.config_parameter')
icp.set_param(cr, uid, 'auth.signup_template_user_id', config.auth_signup_template_user_id.id)
def _get_default_template_user(self, cr, uid, context=None):
data_obj = self.pool.get('ir.model.data')
data_id = data_obj._get_id(cr, uid, 'portal', 'default_template_user')
return data_obj.browse(cr, uid, data_id).res_id
_defaults = {
'auth_signup_template_user_id': _get_default_template_user,
}

View File

@ -2,22 +2,12 @@
<openerp>
<data noupdate="1">
<!-- Create a portal template user -->
<record id="default_template_user" model="res.users">
<field name="name">Template Portal User</field>
<field name="login">portal-template</field>
<!-- No password: this template user doesn't need to log in -->
<field name="password"></field>
<field name="active" eval="False"/>
<!-- Avoid auto-including this user in any default group, just like a typical portal member -->
<field name="groups_id" eval="[(5,)]"/>
<field name="partner_id" eval="ref('base.res_partner_1')"/>
</record>
<record id="portal" model="res.portal">
<field name="name">Portal</field>
<field name="group_id" ref="group_portal_member"/>
<field name="override_menu" eval="False"/>
<!-- Insert the template user from auth_signup in the portal members group -->
<field name="users" eval="[(4,ref('auth_signup.default_template_user'))]"/>
</record>
<!-- Mail group for the company's news -->