odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] linkedin: don't overwrite informations 

bzr revid: chm@openerp.com-20130121134157-2kksdmtfirlue0o0
This commit is contained in:
Christophe Matthieu 2013-01-21 14:41:57 +01:00
parent 9dcd319514
commit 0742601e74
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/web_linkedin/static/src/css/linkedin.css
View File

@ -49,7 +49,7 @@
text-align: center;
}
.openerp .oe_network_advanced_search {
.openerp .oe_linkedin_advanced_search {
margin: auto;
position: absolute;
right: 60px;
@ -58,7 +58,7 @@
font-size: 12px;
}
.openerp .oe_network_advanced_search button {
.openerp .oe_linkedin_advanced_search button {
line-height: 12px;
font-size: 12px;
}
}

19
addons/web_linkedin/static/src/js/linkedin.js
View File

@ -155,6 +155,12 @@ openerp.web_linkedin = function(instance) {
});
to_change.linkedin_url = _.str.sprintf("http://www.linkedin.com/company/%d", entity.id);
_.each(to_change, function (val, key) {
if (self.field_manager.datarecord[key]) {
to_change[key] = self.field_manager.datarecord[key];
}
});
to_change.child_ids = [];
var children_def = $.Deferred();
defs.push(children_def);
@ -187,7 +193,7 @@ openerp.web_linkedin = function(instance) {
return to_change;
});
},
create_or_modify_partner: function (entity, search_similar_partner) {
create_or_modify_partner: function (entity, rpc_search_similar_partner) {
var self = this;
var to_change = {};
var defs = [];
@ -225,7 +231,7 @@ openerp.web_linkedin = function(instance) {
to_change.linkedin_id = entity.id || false;
// find similar partners
if (search_similar_partner) {
if (rpc_search_similar_partner) {
defs.push(new instance.web.DataSetSearch(this, 'res.partner').call("search", [[
"|", ["linkedin_id", "=", to_change.linkedin_id], "&", ["linkedin_id", "=", false],
"|", ["name", "ilike", entity.firstName +"%"+ entity.lastName], ["name", "ilike", entity.lastName +"%"+ entity.firstName]
@ -255,6 +261,12 @@ openerp.web_linkedin = function(instance) {
}));
}
}));
} else {
_.each(to_change, function (val, key) {
if (self.field_manager.datarecord[key]) {
to_change[key] = self.field_manager.datarecord[key];
}
});
}
return $.when.apply($, defs).then(function () {
@ -293,7 +305,7 @@ openerp.web_linkedin = function(instance) {
IN.User.logout();
self.destroy();
});
this.$search = this.$el.parent().find(".oe_network_advanced_search" );
this.$search = this.$el.parent().find(".oe_linkedin_advanced_search" );
this.$url = this.$search.find("input[name='search']" );
this.$button = this.$search.find("button");
@ -421,7 +433,6 @@ openerp.web_linkedin = function(instance) {
},
});
// http://api.linkedin.com/v1/companies?email-domain=apple.com&email-domain=linkedin.com&email-domain=nhl.com
instance.web_linkedin.EntityWidget = instance.web.Widget.extend({
template: "Linkedin.EntityWidget",

2
addons/web_linkedin/static/src/xml/linkedin.xml
View File

@ -36,7 +36,7 @@
</t>
<t t-name="LinkedIn.AdvancedSearch">
<t t-raw="title"/>
<div class="oe_network_advanced_search">
<div class="oe_linkedin_advanced_search">
Search by url or keywords : <input name="search"/> <button>Search</button>
</div>
</t>