[FIX] auth_config
bzr revid: al@openerp.com-20120816225537-7ghb97togd1bjidl
This commit is contained in:
parent
47b8d4ee97
commit
9f2b498a8a
|
@ -25,8 +25,9 @@ class project_configuration(osv.TransientModel):
|
|||
_inherit = 'base.config.settings'
|
||||
|
||||
_columns = {
|
||||
'explanation' : fields.text('Deployment Explanation',),
|
||||
'client_id' : fields.char('Client ID'),
|
||||
'auth_oauth_google_active' : fields.boolean('enable sign in with google'),
|
||||
'auth_oauth_google_client_id' : fields.char('Google client_id'),
|
||||
'auth_oauth_facebook_client_id' : fields.char('Facebook client_id'),
|
||||
}
|
||||
|
||||
# def get_default_alias_domain(self, cr, uid, ids, context=None):
|
||||
|
@ -35,4 +36,4 @@ class project_configuration(osv.TransientModel):
|
|||
# def set_alias_domain(self, cr, uid, ids, context=None):
|
||||
# config_parameters = self.pool.get("ir.config_parameter")
|
||||
# for record in self.browse(cr, uid, ids, context=context):
|
||||
# config_parameters.set_param(cr, uid, "mail.catchall.domain", record.alias_domain or '', context=context)
|
||||
# config_parameters.set_param(cr, uid, "mail.catchall.domain", record.alias_domain or '', context=context)
|
||||
|
|
|
@ -1,17 +1,30 @@
|
|||
<?xml version="1.0"?>
|
||||
<?xml version="1.0"?>
|
||||
<openerp>
|
||||
<data>
|
||||
<record model="ir.ui.view" id="view_general_configuration_auth_oauth">
|
||||
<record id="view_general_configuration_auth_oauth" model="ir.ui.view">
|
||||
<field name="name">base.config.auth.oauth</field>
|
||||
<field name="model">model</field>
|
||||
<field name="type">base.config.settings</field>
|
||||
<field name="model">base.config.settings</field>
|
||||
<field name="inherit_id" ref="base_setup.view_general_configuration"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//field[@name='module_auth_signup']" position="after">
|
||||
<label for="explanation" class="oe_inline"/>
|
||||
<field name="explanation" placeholder="Here goes the explanation" class="oe_inline"/>
|
||||
<xpath expr="//label[@for='module_auth_oauth']" position="after">
|
||||
<div>
|
||||
<field name="auth_oauth_google_active" class="oe_inline"/>
|
||||
<label for="auth_oauth_google_active"/>
|
||||
</div>
|
||||
<div>
|
||||
<p attrs="{'invisible': [('auth_oauth_google_active','=',False)]}">
|
||||
Explanation goes here OpenERP allows to
|
||||
automatically create leads (or others documents)
|
||||
from incoming emails. You can automatically
|
||||
synchronize emails with OpenERP using regular
|
||||
POP/IMAP accounts, using a direct email integration
|
||||
script for your email server, or by manually
|
||||
pushing emails to OpenERP using specific
|
||||
plugins for your preferred email application.
|
||||
</p>
|
||||
</div>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
</data>
|
||||
</openerp>
|
||||
</openerp>
|
||||
|
|
|
@ -32,8 +32,8 @@ class base_config_settings(osv.osv_memory):
|
|||
help="""The portal will give access to a series of documents for your customers; his quotations, his invoices, his projects, etc."""),
|
||||
'module_share': fields.boolean('allow documents sharing',
|
||||
help="""As an example, you will be able to share a project or some tasks to your customers, or quotes/sales to several persons at your customer company, or your agenda availabilities to your contacts."""),
|
||||
'module_auth_signup': fields.boolean('allow new users to sign up'),
|
||||
'module_auth_oauth': fields.boolean('external oauth authentfication (google, facebook, ...)'),
|
||||
'module_auth_signup': fields.boolean('allow external users to sign up'),
|
||||
'module_auth_oauth': fields.boolean('external authentication, login with google, facebook, ...'),
|
||||
}
|
||||
|
||||
def open_company(self, cr, uid, ids, context=None):
|
||||
|
|
|
@ -38,21 +38,12 @@
|
|||
</div>
|
||||
</group>
|
||||
<group>
|
||||
<label for="id" string="Share Data"/>
|
||||
<label for="id" string="Access"/>
|
||||
<div>
|
||||
<div>
|
||||
<field name="module_share" class="oe_inline"/>
|
||||
<label for="module_share"/>
|
||||
</div>
|
||||
<div>
|
||||
<field name="module_portal" class="oe_inline"/>
|
||||
<label for="module_portal"/>
|
||||
</div>
|
||||
</div>
|
||||
</group>
|
||||
<group>
|
||||
<label for="id" string="Authentification"/>
|
||||
<div>
|
||||
<div>
|
||||
<field name="module_auth_signup" class="oe_inline"/>
|
||||
<label for="module_auth_signup"/>
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
<xpath expr="//div[@name='email']" position='inside'>
|
||||
<div>
|
||||
<label for="alias_domain" class="oe_inline"/>
|
||||
<field name="alias_domain" placeholder="mycompany.my.openerp.com" class="oe_inline"/>
|
||||
<field name="alias_domain" placeholder="mycompany.my.openerp.com" class="oe_inline"/>
|
||||
</div>
|
||||
</xpath>
|
||||
</field>
|
||||
|
|
Loading…
Reference in New Issue