diff options
| author | Jigar Amin - OpenERP <jam@tinyerp.com> | 2012-09-14 09:57:25 +0530 |
|---|---|---|
| committer | Jigar Amin - OpenERP <jam@tinyerp.com> | 2012-09-14 09:57:25 +0530 |
| commit | d7dfc3dc1cad3591280b7a7aeb9e2e352cbc1fa8 (patch) | |
| tree | d8b5acdbd13b6a99af89b22e9f46fe8872478d04 /addons/web_linkedin | |
| parent | 275b274dd53aa42a0129fa8c5a356cd2faf6dcf6 (diff) | |
| parent | 9df7381ced04b44e470fe0a060b6b82773f20c84 (diff) | |
[MERGE] lp:openobject-addons
bzr revid: jam@tinyerp.com-20120912044315-t7gtrwck9fc3h9vd
bzr revid: jam@tinyerp.com-20120913045246-iuvrqt992b60tekt
bzr revid: jam@tinyerp.com-20120914042725-jiagjctwti0vd68m
Diffstat (limited to 'addons/web_linkedin')
| -rw-r--r-- | addons/web_linkedin/static/src/js/linkedin.js | 4 | ||||
| -rw-r--r-- | addons/web_linkedin/web_linkedin_view.xml | 13 |
2 files changed, 10 insertions, 7 deletions
diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index 8f6a2b096a5..3cdfbfff410 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -117,6 +117,8 @@ openerp.web_linkedin = function(instance) { "count": 25, }).result(function(result) { children_def.resolve(result); + }).error(function() { + children_def.reject(); }); defs.push(children_def.pipe(function(result) { result = _.reject(result.people.values || [], function(el) { @@ -130,6 +132,8 @@ openerp.web_linkedin = function(instance) { var p_to_change = _.toArray(arguments); to_change.child_ids = p_to_change; }); + }, function() { + return $.when(); })); /* TODO to_change.linkedinUrl = _.str.sprintf("http://www.linkedin.com/company/%d", entity.id); diff --git a/addons/web_linkedin/web_linkedin_view.xml b/addons/web_linkedin/web_linkedin_view.xml index 3b91dba7c87..e2d4903a2d6 100644 --- a/addons/web_linkedin/web_linkedin_view.xml +++ b/addons/web_linkedin/web_linkedin_view.xml @@ -17,8 +17,8 @@ <field name="model">sale.config.settings</field> <field name="inherit_id" ref="base_setup.view_sale_config_settings"/> <field name="arch" type="xml"> - <div name="linkedin" position="inside"> - <form string="Configure Linkedin" version="7.0" class="oe_form_configuration"> + <div name="LinkedIn" position="inside"> + <div attrs="{'invisible':[('module_web_linkedin','=',False)]}"> <p> To use the LinkedIn module with this database, an API Key is required. Please follow this procedure: </p> @@ -33,12 +33,11 @@ <li>The programming tool is Javascript</li> </ul> </li> - <li>Copy the API key down here:</li> + <li>Copy the <strong>API key</strong> here: + <field name="api_key" attrs="{'required':[('module_web_linkedin','=',True)]}" class="oe_inline"/> + </li> </ul> - <group> - <field name="api_key"/> - </group> - </form> + </div> </div> </field> </record> |