diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-08-24 16:40:07 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-08-24 16:40:07 +0200 |
| commit | f6fc11c48b32e1c4e59f90bc18e5dea38cfe8c28 (patch) | |
| tree | 4c88861d7d28fadb4e266b2d27338a13ff017072 /addons/web_linkedin | |
| parent | 7423196143231f210f59aecef3311f83d84d6c3b (diff) | |
| parent | 45cf23353824e059ddfe443aa305d7c10021f200 (diff) | |
[MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120824144007-4r11uoy3sux5f7cv
Diffstat (limited to 'addons/web_linkedin')
| -rw-r--r-- | addons/web_linkedin/web_linkedin.py | 4 | ||||
| -rw-r--r-- | addons/web_linkedin/web_linkedin_view.xml | 34 |
2 files changed, 19 insertions, 19 deletions
diff --git a/addons/web_linkedin/web_linkedin.py b/addons/web_linkedin/web_linkedin.py index 2a6ba24042e..c398ad17f3b 100644 --- a/addons/web_linkedin/web_linkedin.py +++ b/addons/web_linkedin/web_linkedin.py @@ -43,11 +43,13 @@ class web_linkedin_settings(osv.osv_memory): _inherit = 'res.config.settings' _columns = { 'api_key': fields.char(string="API Key", size=50), + 'server_domain': fields.char(size=100), } def get_default_linkedin(self, cr, uid, fields, context=None): key = self.pool.get("ir.config_parameter").get_param(cr, uid, "web.linkedin.apikey") or "" - return {'api_key': key} + dom = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url') + return {'api_key': key, 'server_domain': dom,} def set_linkedin(self, cr, uid, ids, context=None): key = self.browse(cr, uid, ids[0], context)["api_key"] or "" diff --git a/addons/web_linkedin/web_linkedin_view.xml b/addons/web_linkedin/web_linkedin_view.xml index a3b73ec94dc..463bfd49d21 100644 --- a/addons/web_linkedin/web_linkedin_view.xml +++ b/addons/web_linkedin/web_linkedin_view.xml @@ -23,24 +23,22 @@ or <button string="Cancel" type="object" name="cancel" class="oe_link"/> </header> - <div> - <p> - To use the LinkedIn module with this database, an API Key is required. Please follow this procedure: - </p> - <ul> - <li>Go to this URL: - <a href="https://www.linkedin.com/secure/developer" target="_blank">https://www.linkedin.com/secure/developer</a>. - </li> - <li>Log into LinkedIn.</li> - <li>Add a new application and fill the form: - <ul> - <li>JavaScript API Domain: the domain of the url used to log into this database (example: http://localhost:8069)</li> - <li>The programming tool is Javascript</li> - </ul> - </li> - <li>Copy the API key down here:</li> - </ul> - </div> + <p> + To use the LinkedIn module with this database, an API Key is required. Please follow this procedure: + </p> + <ul> + <li>Go to this URL: + <a href="https://www.linkedin.com/secure/developer" target="_blank">https://www.linkedin.com/secure/developer</a>. + </li> + <li>Log into LinkedIn.</li> + <li>Add a new application and fill the form: + <ul> + <li>JavaScript API Domain: <field name="server_domain" readonly="1" style="width:0"/></li> + <li>The programming tool is Javascript</li> + </ul> + </li> + <li>Copy the API key down here:</li> + </ul> <group> <field name="api_key"/> </group> |