From 61b7f5034d0d2b8b609dd99fe32766e48ed99114 Mon Sep 17 00:00:00 2001 From: "Jiten (OpenERP)" Date: Tue, 12 Jun 2012 18:14:54 +0530 Subject: [ADD] Add linkedin module for integration linkedin with openerp. bzr revid: jra@tinyerp.com-20120612124454-78zfn48kerp93c5z --- addons/web_linkedin/static/src/css/linkedin.css | 39 ++ .../web_linkedin/static/src/img/Linkedin_blue.png | Bin 0 -> 5435 bytes .../web_linkedin/static/src/img/Linkedin_grey.png | Bin 0 -> 2748 bytes addons/web_linkedin/static/src/img/icon.png | Bin 0 -> 38257 bytes .../static/src/img/linkedin-profile.gif | Bin 0 -> 2244 bytes addons/web_linkedin/static/src/img/loading.png | Bin 0 -> 5260 bytes .../web_linkedin/static/src/img/twitt-follow.png | Bin 0 -> 12908 bytes addons/web_linkedin/static/src/js/linkedin.js | 667 +++++++++++++++++++++ addons/web_linkedin/static/src/xml/linkedin.xml | 124 ++++ 9 files changed, 830 insertions(+) create mode 100644 addons/web_linkedin/static/src/css/linkedin.css create mode 100644 addons/web_linkedin/static/src/img/Linkedin_blue.png create mode 100644 addons/web_linkedin/static/src/img/Linkedin_grey.png create mode 100644 addons/web_linkedin/static/src/img/icon.png create mode 100644 addons/web_linkedin/static/src/img/linkedin-profile.gif create mode 100644 addons/web_linkedin/static/src/img/loading.png create mode 100644 addons/web_linkedin/static/src/img/twitt-follow.png create mode 100644 addons/web_linkedin/static/src/js/linkedin.js create mode 100644 addons/web_linkedin/static/src/xml/linkedin.xml (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/css/linkedin.css b/addons/web_linkedin/static/src/css/linkedin.css new file mode 100644 index 00000000000..0ca3dc90ac9 --- /dev/null +++ b/addons/web_linkedin/static/src/css/linkedin.css @@ -0,0 +1,39 @@ +.ul-ldn-dropdown { + list-style: none outside none; + padding: 1px; + max-height: 500px; + margin: 0px; + background-color: rgb(255, 255, 255); + border: 1px solid rgb(153, 153, 153); +} + +.li-ldn-dropdown { + margin: 0px; + display: block; + cursor: default; + padding: 3px; + border: 1px solid rgb(255, 255, 255); + background-color: transparent; +} +.li-ldn-dropdown td{ + font-size:10px; + font-weight:normal; + padding: 2px 2px 0px; +} + +.li-ldn-dropdown:hover { + margin: 0px; + display: block; + cursor: pointer; + border: 1px solid rgb(10, 36, 106); + background-color: rgb(182, 189, 210) +} + +.search-box { + background: none repeat scroll 0 0%, -moz-linear-gradient(#EFEFEF, #D8D8D8) repeat scroll 0 0 transparent; + background: none repeat scroll 0 0%, -webkit-linear-gradient(#EFEFEF, #D8D8D8) repeat scroll 0 0 transparent; + border: 1px solid #ABABAB; + border-radius: 3px 3px 3px 3px; + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset; + max-height: 450px; +} diff --git a/addons/web_linkedin/static/src/img/Linkedin_blue.png b/addons/web_linkedin/static/src/img/Linkedin_blue.png new file mode 100644 index 00000000000..c37d0218f7d Binary files /dev/null and b/addons/web_linkedin/static/src/img/Linkedin_blue.png differ diff --git a/addons/web_linkedin/static/src/img/Linkedin_grey.png b/addons/web_linkedin/static/src/img/Linkedin_grey.png new file mode 100644 index 00000000000..726e012f220 Binary files /dev/null and b/addons/web_linkedin/static/src/img/Linkedin_grey.png differ diff --git a/addons/web_linkedin/static/src/img/icon.png b/addons/web_linkedin/static/src/img/icon.png new file mode 100644 index 00000000000..119f74abdd3 Binary files /dev/null and b/addons/web_linkedin/static/src/img/icon.png differ diff --git a/addons/web_linkedin/static/src/img/linkedin-profile.gif b/addons/web_linkedin/static/src/img/linkedin-profile.gif new file mode 100644 index 00000000000..e347e5e3ff8 Binary files /dev/null and b/addons/web_linkedin/static/src/img/linkedin-profile.gif differ diff --git a/addons/web_linkedin/static/src/img/loading.png b/addons/web_linkedin/static/src/img/loading.png new file mode 100644 index 00000000000..5ab0089fccb Binary files /dev/null and b/addons/web_linkedin/static/src/img/loading.png differ diff --git a/addons/web_linkedin/static/src/img/twitt-follow.png b/addons/web_linkedin/static/src/img/twitt-follow.png new file mode 100644 index 00000000000..684813a1ee4 Binary files /dev/null and b/addons/web_linkedin/static/src/img/twitt-follow.png differ diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js new file mode 100644 index 00000000000..e48b7fa7a9a --- /dev/null +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -0,0 +1,667 @@ +/*--------------------------------------------------------- + * OpenERP web_linkedin (module) + *---------------------------------------------------------*/ + +openerp.web_linkedin = function(instance) { + var QWeb = instance.web.qweb; + var _t = instance.web._t; + instance.web.form.widgets.add( + 'Linkedin', 'instance.web_linkedin.Linkedin'); + instance.web_linkedin.Linkedin = instance.web.form.FieldChar.extend({ + template: 'Linkedin', + isAuthorized: false, + render_value: function() { + this._super(); + var self = this; + this.$element.find('#loader').hide(); + if (!this.get("effective_readonly")) { + this._super(); + var context = new instance.web.CompoundContext(this.build_context()); + var build_context = this.build_context(); + this.apikey = build_context.__contexts[0].api_key; + if(this.view.fields['linkedin_id']){ + if(this.view.datarecord['linkedin_id']){ + this.$element.find('#linkedindefault').hide(); + this.$element.find('#linkedinrecord').show(); + }else{ + this.$element.find('#linkedinrecord').hide(); + this.$element.find('#linkedindefault').show(); + } + } + try { + IN.init({ api_key : this.apikey }); + } catch(e) { + if(!this.apikey){ + this.APIWarning = e; + } + if (e.type == "undefined_method") { + this.APIWarning = e; + } + } + var head = document.head || document.getElementsByTagName('head')[0]; + var tag = document.createElement('script'); + tag.type = 'text/javascript'; + tag.src = "http://platform.linkedin.com/in.js"; + if(this.apikey){ + // Registered API key is necessary to integrate with LinkedIn. + tag.innerHTML = 'api_key : '+this.apikey+'\n'; + } + tag.innerHTML = tag.innerHTML + 'authorize : true'; + // On load script Loading text is displayed + /*if(this.$element.find("#imagediv").find('.oe_loading')){ + this.$element.find("#imagediv").find('.oe_loading').remove(); + } + tag.onload=this.$element.find("#imagediv").append('Loading....');*/ + var temp = 0; + $(head).find('script').each( function(i,val) { + if($(val).attr('src')=="http://platform.linkedin.com/in.js"){ + temp = 1; + } + }); + if(temp != 1) { + head.appendChild( tag ); + } + this.notification = new instance.web.Notification(this); + this.notification.appendTo(this.$element); + this.$element.find(".linkedin_icon").click( this.do_load_linkedin ); + this.removeTemplate(); + if(this.view.fields['name'].get_value()!=false){ + /* if value get then display button of profile url */ + if (this.view.fields['profile_id'].get_value() || this.view.datarecord['profile_id']) { + this.setTemplate(this.view.datarecord['profile_id'] , false ); + } + /* if value get then display button of twitter */ + if (this.view.fields['twitter_id'].get_value() || this.view.datarecord['twitter_id']) { + this.setTemplate( false, this.view.datarecord['twitter_id']); + } + } + if (this.view.datarecord['linkedin_id']) { + if (this.view.datarecord['profile_id'] && !this.view.datarecord['twitter_id']) { + if (this.$element.find('#twitterid')) { + this.$element.find('#twitterid').remove(); + } + } + else if (!this.view.datarecord['profile_id'] && this.view.datarecord['twitter_id']) { + if (this.$element.find('#profileid')) { + this.$element.find('#profileid').remove(); + } + } + }else{ + this.removeTemplate(); + } + } else { + this.removeTemplate(); + if(this.view.fields['name'].get_value()!=false){ + var tagtr = document.createElement('tr'); + tagtr.id = "profiletwittor-tr"; + this.$element.append(tagtr); + /* if value get then display button of profile url */ + if (this.view.fields['profile_id'] && this.view.datarecord['profile_id']) { + this.setTemplate( this.view.datarecord['profile_id'] , false ); + } + /* if value get then display button of twitter */ + if (this.view.fields['twitter_id'] && this.view.datarecord['twitter_id']) { + this.setTemplate( false, this.view.datarecord['twitter_id'] ); + } + } + } + }, + APIKeyWarning: function(e) { + e.message= "Linkedin API Key is not registerd/correct.\n Go to Settings, 'General Settings' menu and follow steps to register the LinkedIn API Key."; + instance.web.dialog($(QWeb.render("CrashManager.warning", _t(e))), { + title: _t("Linkedin API Key Warning"), + modal: true, + height: 200, + width: 500, + buttons: [ + { + text: _t("Ok"), + click: function() { $(this).dialog("close"); } + }] + }); + }, + setTemplate: function( URL, AccountName ) { + if(AccountName){ + var AccountName = AccountName.replace(/[^a-zA-Z 0-9]+/g, ''); + Twitt = "https://twitter.com/intent/follow?original_referer=http%3A%2F%2Flocalhost%3A8069%2Fweb%2Fwebclient%2Fhome&screen_name="+AccountName+"&source=followbutton&variant=2.0" + this.$element.find('tr#profiletwittor-tr').append(QWeb.render('TwitterURL',{'URLID': Twitt, 'account': AccountName})) + }else if(URL){ + this.$element.find('tr#profiletwittor-tr').append(QWeb.render('ProfileURL',{'URLID': URL })) + } + }, + removeTemplate: function( flag ) { + if (flag) { + this.$element.find('#searchresults').remove(); + } else { + if (this.$element.find('#profileid')) { + this.$element.find('#profileid').remove(); + } + if (this.$element.find('#twitterid')) { + this.$element.find('#twitterid').remove(); + } + } + }, + /* Load Linkedin Data On search */ + do_load_linkedin: function( e ) { + var self = this; + this.msg_Counter=0; /* used to display notification, when record not found on Linkedin search */ + this.removeTemplate( 1 ); + if(!this.apikey){ + this.APIKeyWarning(this.APIWarning); + e.preventDefault(); + e.stopPropagation(); + e.stopImmediatePropagation(); + return false; + } + if (IN.ENV.auth.oauth_token) { + if (self.$element.find("input").val()) { + self.$element.find('#loader').show(); + $('.linkedin_icon').css('display', 'none'); + /* People Search */ + IN.API.Raw("/people-search:(people:(id,first-name,last-name,picture-url,public-profile-url,formatted-name,location,phone-numbers,im-accounts,main-address,headline))") + .params({ + "first-name": self.$element.find("input").val(), + "count" : 4 + }) + .result( self.do_fetch_detail ); + /* Company Search */ + IN.API.Raw("/company-search:(companies:(id,name,description,industry,logo-url,website-url,locations,twitter-id))") + .params({ + "keywords": self.$element.find("input").val(), + "count" : 4 + }) + .result( self.do_fetch_detail ); + }else{ + this.notification.warn(_t("Linkedin Search"), _t("Please Enter Required Field.")); + } + } + else { + self.do_authorize(); + } + e.preventDefault(); + e.stopPropagation(); + e.stopImmediatePropagation(); + }, + do_authorize: function(resultCallback){ + this.check_authorized(); + if (this.isAuthorized == false){ + IN.User.authorize(resultCallback); + } + }, + check_authorized: function(){ + this.isAuthorized = IN.User.isAuthorized(); + }, + /* Fetch Result from Linkedin and set in searchbox */ + do_fetch_detail: function(result, metadata) { + var self = this; + if (result.people) { + if (result.people._total==0) { + this.msg_Counter++; + } + var count = 0; + for (i in result.people.values) { + var temp = self.validName(result.people.values[i].firstName, result.people.values[i].lastName) + if (temp) { + count++; + } + } + if (count == 4 || count==result.people._total) { + result.people._total = 0; + } + this.resultcontact = result; + }else if (result.companies) { + if (result.companies._total == 0) { + this.msg_Counter++; + } + this.resultcompany = result; + } + this.removeTemplate( 1 ); + if (this.msg_Counter == 2) { + // dialog box + /*new instance.web.dialog($(QWeb.render("SearchWarning")), { + title: _t("Linkedin Search"), + modal: true, + buttons: [ + {text: _t("Ok"), click: function() { $(this).dialog("close"); }} + ] + });*/ + // notification + this.notification.warn(_t("Linkedin Search"), _t("Record Not Found.")); + this.$element.find('#loader').hide(); + if(this.view.fields['linkedin_id']){ + if(this.view.datarecord['linkedin_id']){ + this.$element.find('#linkedindefault').hide(); + this.$element.find('#linkedinrecord').show(); + }else{ + this.$element.find('#linkedinrecord').hide(); + this.$element.find('#linkedindefault').show(); + } + } + } else { + if (this.resultcontact || this.resultcompany) { + this.$element.find('#linkedin-field-name').append(QWeb.render( 'Linkedincontact', {'result' : this.resultcontact, 'resultcompany' : this.resultcompany})) ; + } + } + if(this.$element.find('#searchresults .search-box ul li')){ + this.$element.find('#loader').hide(); + if(this.view.fields['linkedin_id']){ + if(this.view.datarecord['linkedin_id']){ + this.$element.find('#linkedindefault').hide(); + this.$element.find('#linkedinrecord').show(); + }else{ + this.$element.find('#linkedinrecord').hide(); + this.$element.find('#linkedindefault').show(); + } + } + } + this.$element.find('#searchresults .search-box ul li').click( function() { + self.getdata( this ); + }); + $(document).click( function() { + self.removeTemplate( 1 ); + }); + }, + /* Selected record's data fetched */ + getdata: function( e ) { + var self = this; + if (this.resultcontact) { + for (i in this.resultcontact.people.values) { + if (self.resultcontact.people.values[i].id == $(e).attr('id')) { + self.removeTemplate( 1 ); + this.getTwitterAccount( self.resultcontact.people.values[i] ) + } + } + } + if(this.resultcompany){ + for ( i in this.resultcompany.companies.values ) { + if ( self.resultcompany.companies.values[i].id == $(e).attr('id') ) { + self.removeTemplate( 1 ); + self.map_values(self.resultcompany.companies.values[i]); + } + } + } + }, + /* Based on Linkedin Id of record fetch Twitter Account Detail for People */ + getTwitterAccount: function( values, flag, mainfield ){ + var self = this; + IN.API.Profile(values.id).fields('twitter-accounts') + .result(function(acname){ + values.twitterAccounts = acname.values[0].twitterAccounts + if(flag){ + self.map_values(values, flag, mainfield); + }else{ + self.map_values(values); + } + }); + }, + /* Mapping of Linkedin Fields with res.partner Fields + linkedinrecord : contains linkedin record's data + flag : indicates mapping of People search record or for company's contacts/connections (people) + if(flag) mapping for contacts of company + if(!flag) mapping for people search + mainfield : class of child_ids field + */ + map_values: function (linkedinrecord, flag, mainfield){ + var self = this, tempdata = {}, temp_data = 0, id = this.view.datarecord.id; + _(this.view.fields).each(function (field, f) { + if (f=='name') { + if (!flag) { + if (linkedinrecord.formattedName) { + field.set_value(linkedinrecord['formattedName'] || false); + } else if(linkedinrecord.name) { + field.set_value(linkedinrecord['name'] || false); + } + } else { + tempdata[f] = linkedinrecord.firstName+' '+linkedinrecord.lastName; + } + } + else if (f=='property_account_payable') { + if(flag == 1)tempdata[f] = field.get_value() + } + else if (f=='property_account_receivable') { + if(flag == 1)tempdata[f] = field.get_value() + } + else if (f=='type') { + (flag == 1) ? tempdata[f] = field.get_value() : field.get_value(); + } + else if (f=='linkedin_id') { + (flag == 1) ? tempdata[f] = linkedinrecord['id'] : field.set_value(linkedinrecord['id']); + } + else if (f=='profile_id') { + if (linkedinrecord.publicProfileUrl) { + (flag == 1) ? tempdata[f] = linkedinrecord.publicProfileUrl : field.set_value(linkedinrecord.publicProfileUrl); + } else { + field.set_value(false); + tempdata[f] = false; + } + } + else if (f=='twitter_id') { + if (linkedinrecord.twitterAccounts && linkedinrecord.twitterAccounts._total >= 1) { + (flag == 1) ? tempdata[f] = linkedinrecord.twitterAccounts.values[0].providerAccountName : field.set_value(linkedinrecord.twitterAccounts.values[0].providerAccountName); + }else if (linkedinrecord.twitterId) { + (flag == 1) ? tempdata[f] = linkedinrecord.twitterId : field.set_value(linkedinrecord.twitterId); + } else { + (flag == 1) ? tempdata[f] = false : field.set_value(false); + } + } + else if (f=='mobile') { + if (!flag && linkedinrecord.phoneNumbers && linkedinrecord['phoneNumbers']._total>=1 && linkedinrecord['phoneNumbers'].values[0].phoneType == "mobile") { + field.set_value( linkedinrecord['phoneNumbers'].values[0].phoneNumber || false ); + }else if (flag == 1) { + tempdata[f] = field.get_value(); + } else { + field.set_value(false); + } + } + else if (f=='phone') { + if (!flag && linkedinrecord.phoneNumbers && linkedinrecord['phoneNumbers']._total>=1 && linkedinrecord['phoneNumbers'].values[0].phoneType != "mobile") { + field.set_value(linkedinrecord['phoneNumbers'].values[0].phoneNumber || false); + } else if(flag == 1) { + tempdata[f] = field.get_value(); + } else { + field.set_value(false); + } + } + else if (f=='email') { + if (!flag && linkedinrecord.imAccounts && linkedinrecord['imAccounts']._total>=1) { + field.set_value(linkedinrecord['imAccounts'].values[0].imAccountName); + } else if(flag == 1) { + tempdata[f] = field.get_value(); + } else { + field.set_value(false); + } + } + else if (f=='photo') { + if (!flag) { + if (linkedinrecord.pictureUrl && linkedinrecord['pictureUrl']) { + /* Fetch binary data from URL for People */ + self.rpc('/web_linkedin/binary/url2binary',{'url':linkedinrecord['pictureUrl']},function(data){ + field.set_value(data); + }); + } else if (linkedinrecord.logoUrl && linkedinrecord['logoUrl']) { + /* Fetch binary data from URL for Company */ + self.rpc('/web_linkedin/binary/url2binary',{'url':linkedinrecord['logoUrl']},function(data){ + field.set_value(data); + }); + } else { + field.set_value(false); + } + } + else{ + if (linkedinrecord['pictureUrl']) { + temp_data = 1; + /* Fetch binary data from URL for contact of Company */ + self.rpc('/web_linkedin/binary/url2binary',{'url':linkedinrecord['pictureUrl']}).done(function(res){ + tempdata[f] = res; + self.set_o2mdata(tempdata,mainfield) + }); + } else { + tempdata[f] = "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 TkSuQmCC"; + } + } + } + else if (f=='street') { + if (!flag && linkedinrecord.mainAddress && linkedinrecord['mainAddress']) { + field.set_value(linkedinrecord['mainAddress']); + } else if(flag == 1) { + tempdata[f] = field.get_value(); + } else { + field.set_value(false); + } + } + else if (f=='country_id') { + if (!flag && linkedinrecord.location && linkedinrecord['location']) { + field.field.domain = [['code', '=', linkedinrecord['location'].country['code'].toUpperCase()]]; + (new instance.web.DataSetSearch(self, field.field.relation,field.field.context,field.field.domain)).read_slice(['id','name'],{}).then(function(res){ + field.original_value = [res[0].id, res[0].name]; + field.set_value(res[0].id) + }) + } else if (!flag && linkedinrecord.locations && linkedinrecord.locations._total>0) { + if (linkedinrecord.locations.values[0].address['country-code']) { + field.field.domain = ['code', '=', linkedinrecord.locations.values[0].address['country-code'].toUpperCase()]; + (new instance.web.DataSetSearch(self, field.field.relation,field.field.context,field.field.domain)).read_slice(['id','name'],{}).then(function(res){ + field.original_value = [res[0].id, res[0].name]; + field.set_value(res[0].id) + }) + } else { + field.set_value(false); + } + } else if(flag == 1) { + tempdata[f] = field.get_value(); + } else { + field.set_value(false); + } + } + else if (f=='city') { + if (!flag && linkedinrecord.location && linkedinrecord['location']) { + field.set_value(linkedinrecord['location'].name.split(' ')[0] || false); + } else if (!flag && linkedinrecord.locations && linkedinrecord.locations._total>0) { + if (linkedinrecord.locations.values[0].address['city']) { + field.set_value(linkedinrecord.locations.values[0].address['city']); + } else { + field.set_value(false); + } + } else if (flag == 1) { + tempdata[f] = field.get_value(); + } else { + field.set_value(false); + } + } + else if (f=='website') { + if (!flag && linkedinrecord.websiteUrl) { + field.set_value(linkedinrecord['websiteUrl'] || false); + } else if (flag == 1) { + tempdata[f] = field.get_value(); + } else { + field.set_value(false); + } + } + else if (f=='customer') { + if(flag == 1)tempdata[f] = true; + } + else if (f=='supplier') { + } + else if (f=='active') { + (flag == 1) ? tempdata[f] = true : field.set_value(true); + } + else if (f=='is_company') { + if (!flag && linkedinrecord.formattedName) { + field.set_value(false); + } else { + field.set_value(true); + tempdata[f] = false; + } + } + else if (f=='zip') { + if (!flag && linkedinrecord.locations && linkedinrecord.locations._total>0) { + if (linkedinrecord.locations.values[0].address['postalCode']) { + field.set_value(linkedinrecord.locations.values[0].address['postalCode']); + } else { + field.set_value(false); + } + }else if (flag == 1) { + tempdata[f] = field.get_value(); + } else { + field.set_value(false); + } + } + else if (f=='parent_id') { + if (!flag && linkedinrecord.formattedName) { + field.set_value(false); + } else if (!flag && linkedinrecord.name) { + field.set_value(false); + } else { + if (linkedinrecord.formattedName) { + tempdata[f] = [id,self.view.fields['name'].get_value()]; + } + } + } + else if (f=='fax') { + if (!flag && linkedinrecord.locations && linkedinrecord.locations._total>0) { + if (linkedinrecord.locations.values[0].contactInfo['fax']) { + field.set_value(linkedinrecord.locations.values[0].contactInfo['fax']); + } else { + field.set_value(false); + } + } else if (flag == 1) { + tempdata[f] = field.get_value(); + } else { + field.set_value(false); + } + } + else if (f=='use_parent_address') { + (flag == 1) ? tempdata[f] = true : field.set_value(false); + } + else if (f=='child_ids') { + /* For Company Set value of child_ids field */ + if (!flag && linkedinrecord.name) { + self.$element.find('#loader').show(); + $('.linkedin_icon').css('display', 'none'); + /* Fetch contact of Company */ + IN.API.Raw("/people-search:(people:(id,first-name,last-name,formatted-name,picture-url,publicProfileUrl,phone-numbers,im-accounts,main-address,location,relation-to-viewer:(related-connections)))") + //"id", "firstName", "lastName", "pictureUrl", "publicProfileUrl", "formatted-name", "headline", "location", "industry", "languages", "phone-numbers", "im-accounts", "main-address" + .params({ + "company-name" : linkedinrecord.name, + "current-company": true, + "count" : 25 + }) + .result( function (getresult){ + if(getresult.people._total==0){ + self.$element.find('#loader').hide(); + if(self.view.fields['linkedin_id']){ + if(self.view.datarecord['linkedin_id']){ + self.$element.find('#linkedindefault').hide(); + self.$element.find('#linkedinrecord').show(); + }else{ + self.$element.find('#linkedinrecord').hide(); + self.$element.find('#linkedindefault').show(); + } + } + } + self.totalids = [],self.updteids = []; + _(field.dataset.ids).each( function(i) { + if (typeof(i)=="number") { + self.totalids.push(i); + var mobile = self.view.fields['mobile'].get_value(); + var phone = self.view.fields['phone'].get_value(); + var email = self.view.fields['email'].get_value(); + var fax = self.view.fields['fax'].get_value(); + var website = self.view.fields['website'].get_value(); + var zip = self.view.fields['zip'].get_value(); + var city = self.view.fields['city'].get_value(); + var country_id = self.view.fields['country_id'].get_value(); + var street = self.view.fields['street'].get_value(); + field.dataset.write(i,{'mobile':mobile,'phone':phone,'email':email,'fax':fax,'website':website,'zip':zip,'city':city,'country_id':country_id,'street':street},{}); + } + }); + field.dataset.ids = self.totalids; + var counter = 0;/* Indicates All searched records are Invalid or valid */ + self.t_count=0; + self.o2m_count = 0; + for (i in getresult.people.values) { + var connectTemp = self.validName(getresult.people.values[i].firstName, getresult.people.values[i].lastName) + if (connectTemp) { + counter++; + } else { + self.t_count++; + self.getTwitterAccount(getresult.people.values[i], 1, field); + } + } + if (getresult.people._count) { + var total_Count = getresult.people._count; + }else if (getresult.people._total) { + var total_Count = getresult.people._total; + } + /* If counter == total no. of people then all searched records are invalid */ + if (counter == total_Count) { + field.dataset.to_create = []; + field.dataset.ids = []; + field.reload_current_view(); + }else if(getresult.people._total == 0 || getresult.people._count == 0){ + field.dataset.ids = self.totalids; + field.reload_current_view(); + } + }); + } + /* For People Set value of child_ids field */ + else if (!flag && linkedinrecord.formattedName) { + field.set_value(false); + field.set({'invisible':true}); + } + /* For Contact of company Set value of child_ids field */ + else { + tempdata[f] = false; + } + } + else { + (flag == 1) ? tempdata[f] = false : field.set_value(false); + } + field._dirty_flag = true; + field.on('changed_value', self, function() { + if (!flag) { + self.view.do_onchange(field); + self.view.on_form_changed(true); + self.view.do_notify_change(); + } + }); + }); + if (!flag) { + this.removeTemplate(); + if (linkedinrecord.publicProfileUrl) { + this.setTemplate( linkedinrecord.publicProfileUrl , false ); + } + if (linkedinrecord.twitterId) { + this.setTemplate( false , linkedinrecord.twitterId ); + } + if (linkedinrecord.twitterAccounts && linkedinrecord.twitterAccounts._total >= 1) { + this.setTemplate( false , linkedinrecord.twitterAccounts.values[0].providerAccountName ); + } + } + if (flag && temp_data == 0) { + self.set_o2mdata(tempdata, mainfield); + } + }, + /* Update existing value of child_ids field */ + set_childids: function( ids ) { + var self = this; + _(ids).each(function(i){ + self.view.fields['child_ids'].dataset.set_ids(self.view.fields['child_ids'].dataset.ids.concat([i])); + self.view.fields['child_ids'].dataset.write(i, {"parent_id":false}, {}); + }); + }, + /* Set/create o2m contacts of child_ids field */ + set_o2mdata: function(data,field){ + var self = this; + self.o2m_count++; + field.dataset.create(data).then( function(r) { + self.totalids.push(r.result); + field.dataset.set_ids(field.dataset.ids.concat([r.result])); + field.dataset.on_change(); + }).then(); + field.dataset.ids = self.totalids; + field.reload_current_view(); + if (self.t_count == self.o2m_count) { + self.$element.find('#loader').hide(); + //$('.linkedin_icon').css('display', 'block'); + if(this.view.fields['linkedin_id']){ + if(this.view.datarecord['linkedin_id']){ + this.$element.find('#linkedindefault').hide(); + this.$element.find('#linkedinrecord').show(); + }else{ + this.$element.find('#linkedinrecord').hide(); + this.$element.find('#linkedindefault').show(); + } + } + } + }, + /* Name of Searched Linkedin Record is valid or Not */ + validName: function(fname, lname){ + if ((fname == "Private" || fname == "private") || (lname == "Private" || lname == "private") || (fname == "" && lname == "")) { + return true; + } else { + return false; + } + } + }); +}; +// vim:et fdc=0 fdl=0: diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml new file mode 100644 index 00000000000..9321e54787d --- /dev/null +++ b/addons/web_linkedin/static/src/xml/linkedin.xml @@ -0,0 +1,124 @@ + + + + + + + + + + +
+ + +
+ + + Search on LinkedIn + Search on LinkedIn + + + +
+
+ + + + + + View profile on LinkedIn + + + + + + + + Follow + + + + +
Record Not Found.
+ + +
+
+ + + + + + + + +
+ + + +
+ 		+
    + +
  • + + + + + +
    + + + + + + + + +
    + +
    +
    • +     +
+
+ +
+
+ + + + + + + + +
+ + +
    +
  • + + + + + +
    + + + + + + + +
    + +
    +
    • +
+ + + + + \ No newline at end of file -- cgit v1.2.3 From 7b2efd67fc5dd9a826e0343fc132024b30ee48bf Mon Sep 17 00:00:00 2001 From: "Anand Patel (OpenERP)" Date: Thu, 14 Jun 2012 12:46:33 +0530 Subject: [IMP] Improved pop up message when api key not apply. bzr revid: pan@tinyerp.com-20120614071633-vzrq3g0yha1p5skx --- addons/web_linkedin/static/src/img/apikey.png | Bin 0 -> 32154 bytes .../static/src/img/help_to_fill_form.png | Bin 0 -> 146822 bytes addons/web_linkedin/static/src/js/linkedin.js | 19 +++++----- addons/web_linkedin/static/src/xml/linkedin.xml | 39 +++++++++++++++++++++ 4 files changed, 48 insertions(+), 10 deletions(-) create mode 100644 addons/web_linkedin/static/src/img/apikey.png create mode 100644 addons/web_linkedin/static/src/img/help_to_fill_form.png (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/img/apikey.png b/addons/web_linkedin/static/src/img/apikey.png new file mode 100644 index 00000000000..cd17d071af2 Binary files /dev/null and b/addons/web_linkedin/static/src/img/apikey.png differ diff --git a/addons/web_linkedin/static/src/img/help_to_fill_form.png b/addons/web_linkedin/static/src/img/help_to_fill_form.png new file mode 100644 index 00000000000..fe30fe4acbe Binary files /dev/null and b/addons/web_linkedin/static/src/img/help_to_fill_form.png differ diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index e48b7fa7a9a..6c8fc6c5147 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -107,17 +107,16 @@ openerp.web_linkedin = function(instance) { } }, APIKeyWarning: function(e) { - e.message= "Linkedin API Key is not registerd/correct.\n Go to Settings, 'General Settings' menu and follow steps to register the LinkedIn API Key."; - instance.web.dialog($(QWeb.render("CrashManager.warning", _t(e))), { - title: _t("Linkedin API Key Warning"), - modal: true, - height: 200, - width: 500, - buttons: [ - { - text: _t("Ok"), + e.message=""; + instance.web.dialog($(QWeb.render("Register.Linkedin", _t(e))), { + title: _t("Configure your Linkedin Key API"), + modal: true, + width : 825, + buttons:[{ + text: _t("Close"), click: function() { $(this).dialog("close"); } - }] + } + ] }); }, setTemplate: function( URL, AccountName ) { diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml index 9321e54787d..4244fc38b98 100644 --- a/addons/web_linkedin/static/src/xml/linkedin.xml +++ b/addons/web_linkedin/static/src/xml/linkedin.xml @@ -31,6 +31,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + +
1)Go Tohttps://www.linkedin.com/secure/developer +
+ 2) Log you in Linkedin if you did not yet +
+ 3) Add a new Application +
+ 4) Fill in the form +
+ +
+ 5) Copy the API Key +
+ +
+ -- cgit v1.2.3 From 277e800c162811cdc12c545e41919d59e6200056 Mon Sep 17 00:00:00 2001 From: "Anand Patel (OpenERP)" Date: Thu, 14 Jun 2012 16:49:10 +0530 Subject: [IMP] Improved code. bzr revid: pan@tinyerp.com-20120614111910-jyqwdkf8ec35km2i --- addons/web_linkedin/static/src/js/linkedin.js | 31 ++++++++++++++----------- addons/web_linkedin/static/src/xml/linkedin.xml | 17 ++++++++------ 2 files changed, 28 insertions(+), 20 deletions(-) (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index 6c8fc6c5147..f13bbf6d761 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -77,15 +77,15 @@ openerp.web_linkedin = function(instance) { } if (this.view.datarecord['linkedin_id']) { if (this.view.datarecord['profile_id'] && !this.view.datarecord['twitter_id']) { - if (this.$element.find('#twitterid')) { - this.$element.find('#twitterid').remove(); - } - } - else if (!this.view.datarecord['profile_id'] && this.view.datarecord['twitter_id']) { - if (this.$element.find('#profileid')) { - this.$element.find('#profileid').remove(); - } - } + if (this.$element.find('#twitterid')) { + this.$element.find('#twitterid').remove(); + } + } + else if (!this.view.datarecord['profile_id'] && this.view.datarecord['twitter_id']) { + if (this.$element.find('#profileid')) { + this.$element.find('#profileid').remove(); + } + } }else{ this.removeTemplate(); } @@ -111,12 +111,17 @@ openerp.web_linkedin = function(instance) { instance.web.dialog($(QWeb.render("Register.Linkedin", _t(e))), { title: _t("Configure your Linkedin Key API"), modal: true, - width : 825, - buttons:[{ + width : 800, + height:500, + buttons:[ + { text: _t("Close"), - click: function() { $(this).dialog("close"); } + click: function() + { + $(this).dialog("close"); + } } - ] + ] }); }, setTemplate: function( URL, AccountName ) { diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml index 4244fc38b98..80a7b6e2908 100644 --- a/addons/web_linkedin/static/src/xml/linkedin.xml +++ b/addons/web_linkedin/static/src/xml/linkedin.xml @@ -32,10 +32,12 @@ - - +
+
+ - @@ -55,20 +57,21 @@ -
1)Go Tohttps://www.linkedin.com/secure/developer + + 1)Go to...https://www.linkedin.com/secure/developer
- +
- 5) Copy the API Key + + 5) Copy the API Key
- +
+ -- cgit v1.2.3 From 79a911301cea4ca1b9b21bd054c28479bda710af Mon Sep 17 00:00:00 2001 From: "Anand Patel (OpenERP)" Date: Thu, 14 Jun 2012 19:01:04 +0530 Subject: [IMP] Improved code. bzr revid: pan@tinyerp.com-20120614133104-102rzo97d0dq5jhq --- addons/web_linkedin/static/src/js/linkedin.js | 8 +++++++ addons/web_linkedin/static/src/xml/linkedin.xml | 28 ++++++++----------------- 2 files changed, 17 insertions(+), 19 deletions(-) (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index f13bbf6d761..9bfd1697aaf 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -122,7 +122,15 @@ openerp.web_linkedin = function(instance) { } } ] + }); + $("#register").click(function() + { + var linkkey = $("#apikey").val(); + console.log("the key is ",linkkey); + }); + + }, setTemplate: function( URL, AccountName ) { if(AccountName){ diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml index 80a7b6e2908..e7f8b8335bb 100644 --- a/addons/web_linkedin/static/src/xml/linkedin.xml +++ b/addons/web_linkedin/static/src/xml/linkedin.xml @@ -34,26 +34,15 @@
- - - - - - - - - - +
    +
  1. Go to...https://www.linkedin.com/secure/developer
    2. +
  2. Log you in Linkedin if you did not yet
    3. +
  3. Add a new Application
    4. +
  4. Fill in the form
    5. +
+ @@ -70,6 +59,7 @@ +
- 1)Go to...https://www.linkedin.com/secure/developer -
- 2) Log you in Linkedin if you did not yet -
- 3) Add a new Application -
- 4) Fill in the form -
@@ -62,7 +51,7 @@
- 5) Copy the API Key +
  • Copy the API Key
    • -- cgit v1.2.3 From 22a9fc74bfb438b4810805bd9b6c8372ad58a950 Mon Sep 17 00:00:00 2001 From: "Jiten (OpenERP)" Date: Mon, 18 Jun 2012 15:43:56 +0530 Subject: [REV] Remove last changes of commit revision 6895. bzr revid: jra@tinyerp.com-20120618101356-z0epjp7s1sqduwag --- addons/web_linkedin/static/src/img/apikey.png | Bin 32154 -> 0 bytes .../static/src/img/help_to_fill_form.png | Bin 146822 -> 0 bytes addons/web_linkedin/static/src/js/linkedin.js | 19 +++++----- addons/web_linkedin/static/src/xml/linkedin.xml | 39 --------------------- 4 files changed, 10 insertions(+), 48 deletions(-) delete mode 100644 addons/web_linkedin/static/src/img/apikey.png delete mode 100644 addons/web_linkedin/static/src/img/help_to_fill_form.png (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/img/apikey.png b/addons/web_linkedin/static/src/img/apikey.png deleted file mode 100644 index cd17d071af2..00000000000 Binary files a/addons/web_linkedin/static/src/img/apikey.png and /dev/null differ diff --git a/addons/web_linkedin/static/src/img/help_to_fill_form.png b/addons/web_linkedin/static/src/img/help_to_fill_form.png deleted file mode 100644 index fe30fe4acbe..00000000000 Binary files a/addons/web_linkedin/static/src/img/help_to_fill_form.png and /dev/null differ diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index 6c8fc6c5147..e48b7fa7a9a 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -107,16 +107,17 @@ openerp.web_linkedin = function(instance) { } }, APIKeyWarning: function(e) { - e.message=""; - instance.web.dialog($(QWeb.render("Register.Linkedin", _t(e))), { - title: _t("Configure your Linkedin Key API"), - modal: true, - width : 825, - buttons:[{ - text: _t("Close"), + e.message= "Linkedin API Key is not registerd/correct.\n Go to Settings, 'General Settings' menu and follow steps to register the LinkedIn API Key."; + instance.web.dialog($(QWeb.render("CrashManager.warning", _t(e))), { + title: _t("Linkedin API Key Warning"), + modal: true, + height: 200, + width: 500, + buttons: [ + { + text: _t("Ok"), click: function() { $(this).dialog("close"); } - } - ] + }] }); }, setTemplate: function( URL, AccountName ) { diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml index 4244fc38b98..9321e54787d 100644 --- a/addons/web_linkedin/static/src/xml/linkedin.xml +++ b/addons/web_linkedin/static/src/xml/linkedin.xml @@ -31,45 +31,6 @@     - - - - - - - - - - - - - - - - - - - - - - - - -
    1)Go Tohttps://www.linkedin.com/secure/developer -
    - 2) Log you in Linkedin if you did not yet -
    - 3) Add a new Application -
    - 4) Fill in the form -
    - -
    - 5) Copy the API Key -
    - -
    -     -- cgit v1.2.3 From cc659ea35537c1289d7b1f1adb61d7197a2739b9 Mon Sep 17 00:00:00 2001 From: "Anand Patel (OpenERP)" Date: Tue, 19 Jun 2012 15:46:30 +0530 Subject: [IMP] Improved code. bzr revid: pan@tinyerp.com-20120619101630-w1sufff8c38egvjl --- addons/web_linkedin/static/src/js/linkedin.js | 17 +++++++++++++---- addons/web_linkedin/static/src/xml/linkedin.xml | 3 ++- 2 files changed, 15 insertions(+), 5 deletions(-) (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index 9bfd1697aaf..285770adfdd 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -107,11 +107,12 @@ openerp.web_linkedin = function(instance) { } }, APIKeyWarning: function(e) { + var self = this; e.message=""; instance.web.dialog($(QWeb.render("Register.Linkedin", _t(e))), { title: _t("Configure your Linkedin Key API"), modal: true, - width : 800, + width : 840, height:500, buttons:[ { @@ -124,10 +125,18 @@ openerp.web_linkedin = function(instance) { ] }); - $("#register").click(function() - { + $("#register").click(function() { + var linkkey = $("#apikey").val(); - console.log("the key is ",linkkey); + + var key = JSON.stringify(linkkey); + + + self.rpc('/web_linkedin/database/api_key',{'key': key},function(data){ + + }); + + }); diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml index e7f8b8335bb..44664ca7d69 100644 --- a/addons/web_linkedin/static/src/xml/linkedin.xml +++ b/addons/web_linkedin/static/src/xml/linkedin.xml @@ -51,7 +51,8 @@ -
  • Copy the API Key
    • + Copy the API Key + -- cgit v1.2.3 From 48fe78fc281e572d5f1769524b0ecf758dfc9ae5 Mon Sep 17 00:00:00 2001 From: "Jiten (OpenERP)" Date: Tue, 19 Jun 2012 17:15:14 +0530 Subject: [IMP] Improved api key pop up warning. bzr revid: jra@tinyerp.com-20120619114514-2r72ppz7pwwym70h --- addons/web_linkedin/static/src/img/apikey.png | Bin 0 -> 32154 bytes .../static/src/img/help_to_fill_form.png | Bin 0 -> 63353 bytes addons/web_linkedin/static/src/js/linkedin.js | 5 +-- addons/web_linkedin/static/src/xml/linkedin.xml | 46 +++++++++------------ 4 files changed, 21 insertions(+), 30 deletions(-) create mode 100644 addons/web_linkedin/static/src/img/apikey.png create mode 100644 addons/web_linkedin/static/src/img/help_to_fill_form.png (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/img/apikey.png b/addons/web_linkedin/static/src/img/apikey.png new file mode 100644 index 00000000000..cd17d071af2 Binary files /dev/null and b/addons/web_linkedin/static/src/img/apikey.png differ diff --git a/addons/web_linkedin/static/src/img/help_to_fill_form.png b/addons/web_linkedin/static/src/img/help_to_fill_form.png new file mode 100644 index 00000000000..4962d272c3a Binary files /dev/null and b/addons/web_linkedin/static/src/img/help_to_fill_form.png differ diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index ede7cfa444b..697c3a79d29 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -128,9 +128,8 @@ openerp.web_linkedin = function(instance) { }] }); $("#register").click(function() { - var linkkey = $("#apikey").val(); - var key = JSON.stringify(linkkey); - self.rpc('/web_linkedin/database/api_key',{'key': key},function(data){ + var key = JSON.stringify($("#apikey").val()); + self.rpc('/web_linkedin/webclient/api_key',{'key': key},function(data){ }); }); }, diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml index 73c49f52279..b6aa3dc69d3 100644 --- a/addons/web_linkedin/static/src/xml/linkedin.xml +++ b/addons/web_linkedin/static/src/xml/linkedin.xml @@ -34,35 +34,27 @@
    - - - - - - - - - - - - - - -
    -
      -
    1. Go to...https://www.linkedin.com/secure/developer
      2. -
    2. Log you in Linkedin if you did not yet
      3. -
    3. Add a new Application
      4. -
    4. Fill in the form
      5. -
    -
    +
    +

    Go to... + + https://www.linkedin.com/secure/developer + +

    +

    Log you in Linkedin if you did not yet

    +

    Add a new Application

    +

    Fill in the form

    +
    +
    -
    - Copy the API Key - -
    + +
    +

    Copy the API Key: + +

    +
    +
    -
    +
    -- cgit v1.2.3 From f257cb34524e0f230e41b7229bbcd71ad50974d5 Mon Sep 17 00:00:00 2001 From: "Jiten (OpenERP)" Date: Tue, 19 Jun 2012 18:45:18 +0530 Subject: [IMP] Improved code for api key warning pop up. bzr revid: jra@tinyerp.com-20120619131518-k4bx0yavmsshihre --- addons/web_linkedin/static/src/js/linkedin.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index 697c3a79d29..f67619951bd 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -128,9 +128,9 @@ openerp.web_linkedin = function(instance) { }] }); $("#register").click(function() { - var key = JSON.stringify($("#apikey").val()); - self.rpc('/web_linkedin/webclient/api_key',{'key': key},function(data){ - }); + var key = $("#apikey").val(); + var user = new instance.web.DataSet(self, "res.users"); + user.call("set_linkedin_api_key", [key]); }); }, setTemplate: function( URL, AccountName ) { -- cgit v1.2.3 From 7fac66d682582346251638aa5cda290395595391 Mon Sep 17 00:00:00 2001 From: "Jiten (OpenERP)" Date: Thu, 21 Jun 2012 17:17:04 +0530 Subject: [IMP] Minor changes for IN.User.authorization. bzr revid: jra@tinyerp.com-20120621114704-bwgcwcijsx7qel60 --- addons/web_linkedin/static/src/js/linkedin.js | 92 +++++++++++++-------------- 1 file changed, 43 insertions(+), 49 deletions(-) (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index f67619951bd..fdfe0e47dd1 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -106,54 +106,6 @@ openerp.web_linkedin = function(instance) { } } }, - APIKeyWarning: function(e) { -// e.message= "Linkedin API Key is not registerd/correct.\n Go to Settings, 'General Settings' menu and follow steps to register the LinkedIn API Key."; -// instance.web.dialog($(QWeb.render("CrashManager.warning", _t(e))), { -// title: _t("Linkedin API Key Warning"), -// modal: true, -// height: 200, -// width: 500, -// buttons: [ - var self = this; - e.message=""; - instance.web.dialog($(QWeb.render("Register.Linkedin", _t(e))), { - title: _t("Configure your Linkedin Key API"), - modal: true, - width : 840, - height:500, - buttons:[ - { - text: _t("Ok"), - click: function() { $(this).dialog("close"); } - }] - }); - $("#register").click(function() { - var key = $("#apikey").val(); - var user = new instance.web.DataSet(self, "res.users"); - user.call("set_linkedin_api_key", [key]); - }); - }, - setTemplate: function( URL, AccountName ) { - if(AccountName){ - var AccountName = AccountName.replace(/[^a-zA-Z 0-9]+/g, ''); - Twitt = "https://twitter.com/intent/follow?original_referer=http%3A%2F%2Flocalhost%3A8069%2Fweb%2Fwebclient%2Fhome&screen_name="+AccountName+"&source=followbutton&variant=2.0" - this.$element.find('tr#profiletwittor-tr').append(QWeb.render('TwitterURL',{'URLID': Twitt, 'account': AccountName})) - }else if(URL){ - this.$element.find('tr#profiletwittor-tr').append(QWeb.render('ProfileURL',{'URLID': URL })) - } - }, - removeTemplate: function( flag ) { - if (flag) { - this.$element.find('#searchresults').remove(); - } else { - if (this.$element.find('#profileid')) { - this.$element.find('#profileid').remove(); - } - if (this.$element.find('#twitterid')) { - this.$element.find('#twitterid').remove(); - } - } - }, /* Load Linkedin Data On search */ do_load_linkedin: function( e ) { var self = this; @@ -189,7 +141,8 @@ openerp.web_linkedin = function(instance) { } } else { - self.do_authorize(); + //self.do_authorize(); + IN.User.authorize(); } e.preventDefault(); e.stopPropagation(); @@ -204,6 +157,47 @@ openerp.web_linkedin = function(instance) { check_authorized: function(){ this.isAuthorized = IN.User.isAuthorized(); }, + APIKeyWarning: function(e) { + var self = this; + e.message=""; + instance.web.dialog($(QWeb.render("Register.Linkedin", _t(e))), { + title: _t("Configure your Linkedin Key API"), + modal: true, + width : 840, + height:500, + buttons:[ + { + text: _t("Ok"), + click: function() { $(this).dialog("close"); } + }] + }); + $("#register").click(function() { + var key = $("#apikey").val(); + var user = new instance.web.DataSet(self, "res.users"); + user.call("set_linkedin_api_key", [key]); + }); + }, + setTemplate: function( URL, AccountName ) { + if(AccountName){ + var AccountName = AccountName.replace(/[^a-zA-Z 0-9]+/g, ''); + Twitt = "https://twitter.com/intent/follow?original_referer=http%3A%2F%2Flocalhost%3A8069%2Fweb%2Fwebclient%2Fhome&screen_name="+AccountName+"&source=followbutton&variant=2.0" + this.$element.find('tr#profiletwittor-tr').append(QWeb.render('TwitterURL',{'URLID': Twitt, 'account': AccountName})) + }else if(URL){ + this.$element.find('tr#profiletwittor-tr').append(QWeb.render('ProfileURL',{'URLID': URL })) + } + }, + removeTemplate: function( flag ) { + if (flag) { + this.$element.find('#searchresults').remove(); + } else { + if (this.$element.find('#profileid')) { + this.$element.find('#profileid').remove(); + } + if (this.$element.find('#twitterid')) { + this.$element.find('#twitterid').remove(); + } + } + }, /* Fetch Result from Linkedin and set in searchbox */ do_fetch_detail: function(result, metadata) { var self = this; -- cgit v1.2.3 From dd0a2cc66fb6cbc42279970b8226e7396e1170ad Mon Sep 17 00:00:00 2001 From: "Jiten (OpenERP)" Date: Thu, 21 Jun 2012 18:58:42 +0530 Subject: [IMP] Minor change. bzr revid: jra@tinyerp.com-20120621132842-s1f5melcrsi408jl --- addons/web_linkedin/static/src/js/linkedin.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index fdfe0e47dd1..d6c50ca8b99 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -159,8 +159,7 @@ openerp.web_linkedin = function(instance) { }, APIKeyWarning: function(e) { var self = this; - e.message=""; - instance.web.dialog($(QWeb.render("Register.Linkedin", _t(e))), { + instance.web.dialog($(QWeb.render("Register.Linkedin")), { title: _t("Configure your Linkedin Key API"), modal: true, width : 840, -- cgit v1.2.3 From b0826bf5556b008046eb77880c82dc6e427c1ddf Mon Sep 17 00:00:00 2001 From: Vishmita Date: Thu, 21 Jun 2012 19:14:58 +0530 Subject: [IMP] Improved API key warning. bzr revid: vja@tinyerp.com-20120621134458-2vq2xsalq5hn7w8q --- addons/web_linkedin/static/src/css/linkedin.css | 4 +++- addons/web_linkedin/static/src/js/linkedin.js | 18 +++++++++++++++--- addons/web_linkedin/static/src/xml/linkedin.xml | 2 +- 3 files changed, 19 insertions(+), 5 deletions(-) (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/css/linkedin.css b/addons/web_linkedin/static/src/css/linkedin.css index 0ca3dc90ac9..4f61b4e89d0 100644 --- a/addons/web_linkedin/static/src/css/linkedin.css +++ b/addons/web_linkedin/static/src/css/linkedin.css @@ -6,7 +6,9 @@ background-color: rgb(255, 255, 255); border: 1px solid rgb(153, 153, 153); } - +#apikey{ + background-color: #D2D2FF +} .li-ldn-dropdown { margin: 0px; display: block; diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index d6c50ca8b99..d282226def0 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -159,7 +159,7 @@ openerp.web_linkedin = function(instance) { }, APIKeyWarning: function(e) { var self = this; - instance.web.dialog($(QWeb.render("Register.Linkedin")), { + this.dialog = instance.web.dialog($(QWeb.render("Register.Linkedin")), { title: _t("Configure your Linkedin Key API"), modal: true, width : 840, @@ -168,13 +168,25 @@ openerp.web_linkedin = function(instance) { { text: _t("Ok"), click: function() { $(this).dialog("close"); } - }] + }], }); + this.dialog.parent().find('.ui-dialog-titlebar').append('').click(function(){ + self.dialog.remove(); + }) + $('.close').css({ 'margin': '10px 0 0 19px'}) $("#register").click(function() { var key = $("#apikey").val(); var user = new instance.web.DataSet(self, "res.users"); user.call("set_linkedin_api_key", [key]); - }); + if(key.length){ + self.dialog.remove(), + user.__parentedParent.view.reload(); + } + else { + $("#apikey").css({'background-color':'#F66 '}) + } + + }) }, setTemplate: function( URL, AccountName ) { if(AccountName){ diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml index b6aa3dc69d3..f0ee60e331f 100644 --- a/addons/web_linkedin/static/src/xml/linkedin.xml +++ b/addons/web_linkedin/static/src/xml/linkedin.xml @@ -49,7 +49,7 @@

    Copy the API Key: - +

    -- cgit v1.2.3 From 2251aa0b7882ae7368e6667914e9a7d468e3bfee Mon Sep 17 00:00:00 2001 From: "Jiten (OpenERP)" Date: Fri, 22 Jun 2012 12:16:01 +0530 Subject: [IMP] Improved apikey wizard. bzr revid: jra@tinyerp.com-20120622064601-oatb5npqwhh7r9j5 --- addons/web_linkedin/static/src/js/linkedin.js | 7 ++++--- addons/web_linkedin/static/src/xml/linkedin.xml | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index d282226def0..a3d36ae284b 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -168,7 +168,7 @@ openerp.web_linkedin = function(instance) { { text: _t("Ok"), click: function() { $(this).dialog("close"); } - }], + }] }); this.dialog.parent().find('.ui-dialog-titlebar').append('').click(function(){ self.dialog.remove(); @@ -176,14 +176,15 @@ openerp.web_linkedin = function(instance) { $('.close').css({ 'margin': '10px 0 0 19px'}) $("#register").click(function() { var key = $("#apikey").val(); - var user = new instance.web.DataSet(self, "res.users"); - user.call("set_linkedin_api_key", [key]); if(key.length){ + var user = new instance.web.DataSet(self, "res.users"); + user.call("set_linkedin_api_key", [key]); self.dialog.remove(), user.__parentedParent.view.reload(); } else { $("#apikey").css({'background-color':'#F66 '}) + self.notification.warn(_t("Linkedin Search"), _t("Please Enter Required Key.")); } }) diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml index f0ee60e331f..6ced2c7dff5 100644 --- a/addons/web_linkedin/static/src/xml/linkedin.xml +++ b/addons/web_linkedin/static/src/xml/linkedin.xml @@ -12,8 +12,8 @@
    - Search on LinkedIn - Search on LinkedIn + Search on LinkedIn + Search on LinkedIn -- cgit v1.2.3 From e1ddabaff0fefb622511c8513f1b25416b031d74 Mon Sep 17 00:00:00 2001 From: "Jiten (OpenERP)" Date: Fri, 22 Jun 2012 17:07:36 +0530 Subject: [IMP] Improved code. bzr revid: jra@tinyerp.com-20120622113736-ic23elcxqtf4md96 --- addons/web_linkedin/static/src/css/linkedin.css | 19 ++++++++++++++++--- addons/web_linkedin/static/src/img/apikey.png | Bin 32154 -> 26023 bytes addons/web_linkedin/static/src/xml/linkedin.xml | 22 +++++++++++----------- 3 files changed, 27 insertions(+), 14 deletions(-) (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/css/linkedin.css b/addons/web_linkedin/static/src/css/linkedin.css index 4f61b4e89d0..949726a6246 100644 --- a/addons/web_linkedin/static/src/css/linkedin.css +++ b/addons/web_linkedin/static/src/css/linkedin.css @@ -6,9 +6,6 @@ background-color: rgb(255, 255, 255); border: 1px solid rgb(153, 153, 153); } -#apikey{ - background-color: #D2D2FF -} .li-ldn-dropdown { margin: 0px; display: block; @@ -39,3 +36,19 @@ box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset; max-height: 450px; } +#apikey{ + background-color: #D2D2FF; +} +#register{ + margin-left: 10px; +} + +.lbl-ldnbox{ + font-size:12px; +} +#searchresults{ + -webkit-margin-start: -70px; + -moz-margin-start: -70px; + z-index: 2000; + position: absolute; +} \ No newline at end of file diff --git a/addons/web_linkedin/static/src/img/apikey.png b/addons/web_linkedin/static/src/img/apikey.png index cd17d071af2..423b732b502 100644 Binary files a/addons/web_linkedin/static/src/img/apikey.png and b/addons/web_linkedin/static/src/img/apikey.png differ diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml index 6ced2c7dff5..28c77ec82bc 100644 --- a/addons/web_linkedin/static/src/xml/linkedin.xml +++ b/addons/web_linkedin/static/src/xml/linkedin.xml @@ -35,25 +35,25 @@
    -

    Go to... +

    1) Go to : https://www.linkedin.com/secure/developer

    -

    Log you in Linkedin if you did not yet

    -

    Add a new Application

    -

    Fill in the form

    +

    2) Log you in Linkedin if you did not yet

    +

    3) Add a New Application

    +

    4) Fill in the Form

    - +
    -

    Copy the API Key: - +

    5) Copy the API Key: +

    - +
    @@ -69,14 +69,14 @@
    Record Not Found.
    -
    +
    @@ -118,7 +118,7 @@ -- cgit v1.2.3 From 6e5be26efa7d4df89a0255c2f05ee7849f15784e Mon Sep 17 00:00:00 2001 From: "Jiten (OpenERP)" Date: Mon, 25 Jun 2012 16:37:01 +0530 Subject: [IMP] Improved code. bzr revid: jra@tinyerp.com-20120625110701-ihz5d55hxwoyoak1 --- addons/web_linkedin/static/src/js/linkedin.js | 127 ++++++++++++-------------- 1 file changed, 59 insertions(+), 68 deletions(-) (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index a3d36ae284b..8dc836d2b36 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -16,9 +16,31 @@ openerp.web_linkedin = function(instance) { this.$element.find('#loader').hide(); if (!this.get("effective_readonly")) { this._super(); - var context = new instance.web.CompoundContext(this.build_context()); - var build_context = this.build_context(); - this.apikey = build_context.__contexts[0].api_key; + self.user = new instance.web.DataSetSearch(self, 'res.users', null, null) + .read_slice(['id','name','company_id'], {"domain": [['id','=',self.session.uid]]}).then(function(results) { + self.company_id = results[0].company_id[0]; + self.company = new instance.web.DataSetSearch(self, 'res.company', null, null) + .read_slice(['linkedin_api_key','name'], {"domain": [['id','=',self.company_id]]}).then(function(records) { + self.apikey = records[0].linkedin_api_key; + if (self.apikey) { + var head = document.head || document.getElementsByTagName('head')[0]; + var tag = document.createElement('script'); + tag.type = 'text/javascript'; + tag.src = "http://platform.linkedin.com/in.js"; + tag.innerHTML = 'api_key : '+self.apikey+'\n'; + tag.innerHTML = tag.innerHTML + 'authorize : true'; + var temp = 0; + $(head).find('script').each( function(i,val) { + if($(val).attr('src')=="http://platform.linkedin.com/in.js"){ + temp = 1; + } + }); + if(temp != 1) { + head.appendChild( tag ); + } + } + }); + }); if(this.view.fields['linkedin_id']){ if(this.view.datarecord['linkedin_id']){ this.$element.find('#linkedindefault').hide(); @@ -28,39 +50,6 @@ openerp.web_linkedin = function(instance) { this.$element.find('#linkedindefault').show(); } } - try { - IN.init({ api_key : this.apikey }); - } catch(e) { - if(!this.apikey){ - this.APIWarning = e; - } - if (e.type == "undefined_method") { - this.APIWarning = e; - } - } - var head = document.head || document.getElementsByTagName('head')[0]; - var tag = document.createElement('script'); - tag.type = 'text/javascript'; - tag.src = "http://platform.linkedin.com/in.js"; - if(this.apikey){ - // Registered API key is necessary to integrate with LinkedIn. - tag.innerHTML = 'api_key : '+this.apikey+'\n'; - } - tag.innerHTML = tag.innerHTML + 'authorize : true'; - // On load script Loading text is displayed - /*if(this.$element.find("#imagediv").find('.oe_loading')){ - this.$element.find("#imagediv").find('.oe_loading').remove(); - } - tag.onload=this.$element.find("#imagediv").append('Loading....');*/ - var temp = 0; - $(head).find('script').each( function(i,val) { - if($(val).attr('src')=="http://platform.linkedin.com/in.js"){ - temp = 1; - } - }); - if(temp != 1) { - head.appendChild( tag ); - } this.notification = new instance.web.Notification(this); this.notification.appendTo(this.$element); this.$element.find(".linkedin_icon").click( this.do_load_linkedin ); @@ -111,42 +100,44 @@ openerp.web_linkedin = function(instance) { var self = this; this.msg_Counter=0; /* used to display notification, when record not found on Linkedin search */ this.removeTemplate( 1 ); - if(!this.apikey){ - this.APIKeyWarning(this.APIWarning); + if (this.apikey){ + if (IN.ENV.auth.oauth_token) { + if (self.$element.find("input").val()) { + self.$element.find('#loader').show(); + $('.linkedin_icon').css('display', 'none'); + /* People Search */ + IN.API.Raw("/people-search:(people:(id,first-name,last-name,picture-url,public-profile-url,formatted-name,location,phone-numbers,im-accounts,main-address,headline))") + .params({ + "first-name": self.$element.find("input").val(), + "count" : 4 + }) + .result( self.do_fetch_detail ); + /* Company Search */ + IN.API.Raw("/company-search:(companies:(id,name,description,industry,logo-url,website-url,locations,twitter-id))") + .params({ + "keywords": self.$element.find("input").val(), + "count" : 4 + }) + .result( self.do_fetch_detail ); + }else{ + this.notification.warn(_t("Linkedin Search"), _t("Please Enter Required Field.")); + } + } + else { + self.do_authorize(); + //IN.User.authorize(); + } + e.preventDefault(); + e.stopPropagation(); + e.stopImmediatePropagation(); + + } else { + this.APIKeyWarning(); e.preventDefault(); e.stopPropagation(); e.stopImmediatePropagation(); return false; } - if (IN.ENV.auth.oauth_token) { - if (self.$element.find("input").val()) { - self.$element.find('#loader').show(); - $('.linkedin_icon').css('display', 'none'); - /* People Search */ - IN.API.Raw("/people-search:(people:(id,first-name,last-name,picture-url,public-profile-url,formatted-name,location,phone-numbers,im-accounts,main-address,headline))") - .params({ - "first-name": self.$element.find("input").val(), - "count" : 4 - }) - .result( self.do_fetch_detail ); - /* Company Search */ - IN.API.Raw("/company-search:(companies:(id,name,description,industry,logo-url,website-url,locations,twitter-id))") - .params({ - "keywords": self.$element.find("input").val(), - "count" : 4 - }) - .result( self.do_fetch_detail ); - }else{ - this.notification.warn(_t("Linkedin Search"), _t("Please Enter Required Field.")); - } - } - else { - //self.do_authorize(); - IN.User.authorize(); - } - e.preventDefault(); - e.stopPropagation(); - e.stopImmediatePropagation(); }, do_authorize: function(resultCallback){ this.check_authorized(); @@ -180,7 +171,7 @@ openerp.web_linkedin = function(instance) { var user = new instance.web.DataSet(self, "res.users"); user.call("set_linkedin_api_key", [key]); self.dialog.remove(), - user.__parentedParent.view.reload(); + self.__parentedParent.reload(); } else { $("#apikey").css({'background-color':'#F66 '}) -- cgit v1.2.3 From 07523bd2340149df0ce510bcc7f3bc97412a7d7e Mon Sep 17 00:00:00 2001 From: "Jiten (OpenERP)" Date: Tue, 26 Jun 2012 18:25:24 +0530 Subject: [IMP] Minor change. bzr revid: jra@tinyerp.com-20120626125524-ukzxseal1hbkqzxa --- addons/web_linkedin/static/src/js/linkedin.js | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index 8dc836d2b36..9826200e05e 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -25,17 +25,20 @@ openerp.web_linkedin = function(instance) { if (self.apikey) { var head = document.head || document.getElementsByTagName('head')[0]; var tag = document.createElement('script'); + tag.setAttribute('id', 'addedScript'); tag.type = 'text/javascript'; tag.src = "http://platform.linkedin.com/in.js"; tag.innerHTML = 'api_key : '+self.apikey+'\n'; tag.innerHTML = tag.innerHTML + 'authorize : true'; var temp = 0; $(head).find('script').each( function(i,val) { - if($(val).attr('src')=="http://platform.linkedin.com/in.js"){ - temp = 1; + if ($(val).attr('src')) { + if ($(val).attr('src') == "http://platform.linkedin.com/in.js") { + temp = 1; + } } }); - if(temp != 1) { + if (temp != 1 ) { head.appendChild( tag ); } } @@ -101,6 +104,13 @@ openerp.web_linkedin = function(instance) { this.msg_Counter=0; /* used to display notification, when record not found on Linkedin search */ this.removeTemplate( 1 ); if (this.apikey){ + if (IN.ENV.auth) { + if (IN.ENV.auth.api_key != this.apikey){ + return false; + } + }else{ + return false; + } if (IN.ENV.auth.oauth_token) { if (self.$element.find("input").val()) { self.$element.find('#loader').show(); @@ -125,7 +135,6 @@ openerp.web_linkedin = function(instance) { } else { self.do_authorize(); - //IN.User.authorize(); } e.preventDefault(); e.stopPropagation(); -- cgit v1.2.3 From df620eb725c1b8be4750f77a645436eb2e87f848 Mon Sep 17 00:00:00 2001 From: "Jiten (OpenERP)" Date: Tue, 26 Jun 2012 18:35:03 +0530 Subject: [IMP] Minor change to add close event on api popup. bzr revid: jra@tinyerp.com-20120626130503-bpq1113uitq8avvh --- addons/web_linkedin/static/src/js/linkedin.js | 1 + 1 file changed, 1 insertion(+) (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index 9826200e05e..6b896e16083 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -164,6 +164,7 @@ openerp.web_linkedin = function(instance) { modal: true, width : 840, height:500, + close: function(){ self.dialog.remove();}, buttons:[ { text: _t("Ok"), -- cgit v1.2.3 From f97e3adc43d8b4c1957620d9bf1dfbd4a562c1cc Mon Sep 17 00:00:00 2001 From: "Jiten (OpenERP)" Date: Tue, 26 Jun 2012 19:03:37 +0530 Subject: [IMP] Improved api button of dialog box. bzr revid: jra@tinyerp.com-20120626133337-08vmfyblesa91ud8 --- addons/web_linkedin/static/src/css/linkedin.css | 6 ++++-- addons/web_linkedin/static/src/js/linkedin.js | 10 +++++----- addons/web_linkedin/static/src/xml/linkedin.xml | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/css/linkedin.css b/addons/web_linkedin/static/src/css/linkedin.css index 949726a6246..519a28badcb 100644 --- a/addons/web_linkedin/static/src/css/linkedin.css +++ b/addons/web_linkedin/static/src/css/linkedin.css @@ -39,8 +39,10 @@ #apikey{ background-color: #D2D2FF; } -#register{ - margin-left: 10px; +.btn_api{ + background: #F66 !important; + border: 1px solid #D00 !important; + font-weight: bold; } .lbl-ldnbox{ diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index 6b896e16083..99d5e470392 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -165,11 +165,11 @@ openerp.web_linkedin = function(instance) { width : 840, height:500, close: function(){ self.dialog.remove();}, - buttons:[ - { - text: _t("Ok"), - click: function() { $(this).dialog("close"); } - }] +// buttons:[ +// { +// text: _t("Ok"), +// click: function() { $(this).dialog("close"); } +// }] }); this.dialog.parent().find('.ui-dialog-titlebar').append('').click(function(){ self.dialog.remove(); diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml index 28c77ec82bc..0d4205b7e78 100644 --- a/addons/web_linkedin/static/src/xml/linkedin.xml +++ b/addons/web_linkedin/static/src/xml/linkedin.xml @@ -49,7 +49,7 @@

    5) Copy the API Key: - +

    -- cgit v1.2.3 From c3006f004e8ba2f645e24b322700d8f08f5b6e33 Mon Sep 17 00:00:00 2001 From: "Jiten (OpenERP)" Date: Tue, 26 Jun 2012 19:12:56 +0530 Subject: [IMP] Code optimization. bzr revid: jra@tinyerp.com-20120626134256-b2f1ufa0w40j8ibz --- addons/web_linkedin/static/src/js/linkedin.js | 67 +++++++-------------------- 1 file changed, 16 insertions(+), 51 deletions(-) (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index 99d5e470392..461be5c5b1d 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -44,15 +44,7 @@ openerp.web_linkedin = function(instance) { } }); }); - if(this.view.fields['linkedin_id']){ - if(this.view.datarecord['linkedin_id']){ - this.$element.find('#linkedindefault').hide(); - this.$element.find('#linkedinrecord').show(); - }else{ - this.$element.find('#linkedinrecord').hide(); - this.$element.find('#linkedindefault').show(); - } - } + self.linkedin_icon_color(); this.notification = new instance.web.Notification(this); this.notification.appendTo(this.$element); this.$element.find(".linkedin_icon").click( this.do_load_linkedin ); @@ -165,11 +157,6 @@ openerp.web_linkedin = function(instance) { width : 840, height:500, close: function(){ self.dialog.remove();}, -// buttons:[ -// { -// text: _t("Ok"), -// click: function() { $(this).dialog("close"); } -// }] }); this.dialog.parent().find('.ui-dialog-titlebar').append('').click(function(){ self.dialog.remove(); @@ -237,26 +224,9 @@ openerp.web_linkedin = function(instance) { } this.removeTemplate( 1 ); if (this.msg_Counter == 2) { - // dialog box - /*new instance.web.dialog($(QWeb.render("SearchWarning")), { - title: _t("Linkedin Search"), - modal: true, - buttons: [ - {text: _t("Ok"), click: function() { $(this).dialog("close"); }} - ] - });*/ - // notification this.notification.warn(_t("Linkedin Search"), _t("Record Not Found.")); this.$element.find('#loader').hide(); - if(this.view.fields['linkedin_id']){ - if(this.view.datarecord['linkedin_id']){ - this.$element.find('#linkedindefault').hide(); - this.$element.find('#linkedinrecord').show(); - }else{ - this.$element.find('#linkedinrecord').hide(); - this.$element.find('#linkedindefault').show(); - } - } + self.linkedin_icon_color(); } else { if (this.resultcontact || this.resultcompany) { this.$element.find('#linkedin-field-name').append(QWeb.render( 'Linkedincontact', {'result' : this.resultcontact, 'resultcompany' : this.resultcompany})) ; @@ -264,15 +234,7 @@ openerp.web_linkedin = function(instance) { } if(this.$element.find('#searchresults .search-box ul li')){ this.$element.find('#loader').hide(); - if(this.view.fields['linkedin_id']){ - if(this.view.datarecord['linkedin_id']){ - this.$element.find('#linkedindefault').hide(); - this.$element.find('#linkedinrecord').show(); - }else{ - this.$element.find('#linkedinrecord').hide(); - this.$element.find('#linkedindefault').show(); - } - } + self.linkedin_icon_color(); } this.$element.find('#searchresults .search-box ul li').click( function() { self.getdata( this ); @@ -662,16 +624,7 @@ openerp.web_linkedin = function(instance) { field.reload_current_view(); if (self.t_count == self.o2m_count) { self.$element.find('#loader').hide(); - //$('.linkedin_icon').css('display', 'block'); - if(this.view.fields['linkedin_id']){ - if(this.view.datarecord['linkedin_id']){ - this.$element.find('#linkedindefault').hide(); - this.$element.find('#linkedinrecord').show(); - }else{ - this.$element.find('#linkedinrecord').hide(); - this.$element.find('#linkedindefault').show(); - } - } + self.linkedin_icon_color(); } }, /* Name of Searched Linkedin Record is valid or Not */ @@ -681,6 +634,18 @@ openerp.web_linkedin = function(instance) { } else { return false; } + }, + // Linkedin icon color changed to distinguise record based on linkedin or not. + linkedin_icon_color: function(e) { + if(this.view.fields['linkedin_id']){ + if(this.view.datarecord['linkedin_id']){ + this.$element.find('#linkedindefault').hide(); + this.$element.find('#linkedinrecord').show(); + }else{ + this.$element.find('#linkedinrecord').hide(); + this.$element.find('#linkedindefault').show(); + } + } } }); }; -- cgit v1.2.3 From 5f992eb4bec9249bc64e03259846aa0498612609 Mon Sep 17 00:00:00 2001 From: "Jiten (OpenERP)" Date: Tue, 26 Jun 2012 19:20:36 +0530 Subject: [IMP] dicrease size of linkedin button. bzr revid: jra@tinyerp.com-20120626135036-zq7zq41yuflep6u1 --- addons/web_linkedin/static/src/js/linkedin.js | 2 +- addons/web_linkedin/static/src/xml/linkedin.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index 461be5c5b1d..890c852313f 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -156,7 +156,7 @@ openerp.web_linkedin = function(instance) { modal: true, width : 840, height:500, - close: function(){ self.dialog.remove();}, + close: function(){ self.dialog.remove();} }); this.dialog.parent().find('.ui-dialog-titlebar').append('').click(function(){ self.dialog.remove(); diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml index 0d4205b7e78..7f008aa2e13 100644 --- a/addons/web_linkedin/static/src/xml/linkedin.xml +++ b/addons/web_linkedin/static/src/xml/linkedin.xml @@ -12,8 +12,8 @@
    - Search on LinkedIn - Search on LinkedIn + Search on LinkedIn + Search on LinkedIn -- cgit v1.2.3 From 112bc2ad6a33c73a83d50d7b7f5fe5e0b8e96792 Mon Sep 17 00:00:00 2001 From: "Jiten (OpenERP)" Date: Wed, 27 Jun 2012 11:59:56 +0530 Subject: [IMP] Improved linkedin people search. bzr revid: jra@tinyerp.com-20120627062956-7s69wmx45sv5jv1r --- addons/web_linkedin/static/src/js/linkedin.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index 890c852313f..a04f0c69737 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -110,7 +110,7 @@ openerp.web_linkedin = function(instance) { /* People Search */ IN.API.Raw("/people-search:(people:(id,first-name,last-name,picture-url,public-profile-url,formatted-name,location,phone-numbers,im-accounts,main-address,headline))") .params({ - "first-name": self.$element.find("input").val(), + "keywords": self.$element.find("input").val(), "count" : 4 }) .result( self.do_fetch_detail ); -- cgit v1.2.3 From ea46eb264517fac17720f3a9a524c766e891ac1d Mon Sep 17 00:00:00 2001 From: "Jiten (OpenERP)" Date: Wed, 27 Jun 2012 13:22:05 +0530 Subject: [IMP] Improved code. bzr revid: jra@tinyerp.com-20120627075205-g8cgoev08w6ytw7s --- addons/web_linkedin/static/src/js/linkedin.js | 15 +++++----- addons/web_linkedin/static/src/xml/linkedin.xml | 40 ++++++++++++------------- 2 files changed, 27 insertions(+), 28 deletions(-) (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index a04f0c69737..3e5f9a95c13 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -152,23 +152,24 @@ openerp.web_linkedin = function(instance) { APIKeyWarning: function(e) { var self = this; this.dialog = instance.web.dialog($(QWeb.render("Register.Linkedin")), { - title: _t("Configure your Linkedin Key API"), + title: _t("Connect to LinkedIn"), modal: true, width : 840, height:500, - close: function(){ self.dialog.remove();} + close: function(){ self.dialog.remove();}, + buttons:[ + { + text: _t("Cancel"), + click: function() { self.dialog.remove(); } + }] }); - this.dialog.parent().find('.ui-dialog-titlebar').append('').click(function(){ - self.dialog.remove(); - }) - $('.close').css({ 'margin': '10px 0 0 19px'}) $("#register").click(function() { var key = $("#apikey").val(); if(key.length){ var user = new instance.web.DataSet(self, "res.users"); user.call("set_linkedin_api_key", [key]); self.dialog.remove(), - self.__parentedParent.reload(); + //self.__parentedParent.reload(); } else { $("#apikey").css({'background-color':'#F66 '}) diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml index 7f008aa2e13..6b0795049be 100644 --- a/addons/web_linkedin/static/src/xml/linkedin.xml +++ b/addons/web_linkedin/static/src/xml/linkedin.xml @@ -34,27 +34,25 @@
    -
    -

    1) Go to : - - https://www.linkedin.com/secure/developer - -

    -

    2) Log you in Linkedin if you did not yet

    -

    3) Add a New Application

    -

    4) Fill in the Form

    -
    -
    - -
    -
    -

    5) Copy the API Key: - -

    -
    -
    - -
    +

    Connect OpneERP to LinkedIn to allow synchronizing companies and people with LinkedIn contacts in order to
    + get their data automatically (photos, address, news). You just need to setup the API key once, and it will work
    + for all users of your system. +

    +
    +
    +

    1) Go to : + + https://www.linkedin.com/secure/developer + +

    +

    2) Log into LinkedIn if not already done

    +

    3) Click on "Add a new application"

    +

    4) Fill in the "Application Info" form with the following data:

    +

    - Integration URL: "https://yourcompany.my.openerp.com"

    +

    - Javascript API domain: "yourcompany.my.openerp.com"

    +

    5) Copy the API key here: + +

    -- cgit v1.2.3 From 646d937e30ebc67482e222ed7d472c177b9553cc Mon Sep 17 00:00:00 2001 From: "Jiten (OpenERP)" Date: Wed, 27 Jun 2012 13:45:22 +0530 Subject: [IMP] Minor change. bzr revid: jra@tinyerp.com-20120627081522-k1w8dbs1ae6ammdp --- addons/web_linkedin/static/src/js/linkedin.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index 3e5f9a95c13..aae28d3c405 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -165,10 +165,10 @@ openerp.web_linkedin = function(instance) { }); $("#register").click(function() { var key = $("#apikey").val(); - if(key.length){ + if(key){ var user = new instance.web.DataSet(self, "res.users"); user.call("set_linkedin_api_key", [key]); - self.dialog.remove(), + self.dialog.remove(); //self.__parentedParent.reload(); } else { -- cgit v1.2.3 From 8300cbe681838aacd1a4e573e82535eb21b0cab9 Mon Sep 17 00:00:00 2001 From: "Jiten (OpenERP)" Date: Wed, 27 Jun 2012 13:48:30 +0530 Subject: [IMP] Improved api key dialog. bzr revid: jra@tinyerp.com-20120627081830-a9e88vet8an5u2op --- addons/web_linkedin/static/src/js/linkedin.js | 2 +- addons/web_linkedin/static/src/xml/linkedin.xml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index aae28d3c405..f5103826a31 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -154,7 +154,7 @@ openerp.web_linkedin = function(instance) { this.dialog = instance.web.dialog($(QWeb.render("Register.Linkedin")), { title: _t("Connect to LinkedIn"), modal: true, - width : 840, + width : 700, height:500, close: function(){ self.dialog.remove();}, buttons:[ diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml index 6b0795049be..bbe077edc82 100644 --- a/addons/web_linkedin/static/src/xml/linkedin.xml +++ b/addons/web_linkedin/static/src/xml/linkedin.xml @@ -39,7 +39,6 @@ for all users of your system.


    -

    1) Go to : https://www.linkedin.com/secure/developer -- cgit v1.2.3 From a60783dbfd95a2eb69a159df1e2c8a1df0077a12 Mon Sep 17 00:00:00 2001 From: "Jiten (OpenERP)" Date: Wed, 27 Jun 2012 16:14:09 +0530 Subject: [IMP] Improved code to remove reload on close dialog of api key and now user direct search by click on linkedin button. bzr revid: jra@tinyerp.com-20120627104409-gi12zswk3akwbker --- addons/web_linkedin/static/src/js/linkedin.js | 45 ++++++++++++++++----------- 1 file changed, 26 insertions(+), 19 deletions(-) (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index f5103826a31..34caf29c68a 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -23,24 +23,7 @@ openerp.web_linkedin = function(instance) { .read_slice(['linkedin_api_key','name'], {"domain": [['id','=',self.company_id]]}).then(function(records) { self.apikey = records[0].linkedin_api_key; if (self.apikey) { - var head = document.head || document.getElementsByTagName('head')[0]; - var tag = document.createElement('script'); - tag.setAttribute('id', 'addedScript'); - tag.type = 'text/javascript'; - tag.src = "http://platform.linkedin.com/in.js"; - tag.innerHTML = 'api_key : '+self.apikey+'\n'; - tag.innerHTML = tag.innerHTML + 'authorize : true'; - var temp = 0; - $(head).find('script').each( function(i,val) { - if ($(val).attr('src')) { - if ($(val).attr('src') == "http://platform.linkedin.com/in.js") { - temp = 1; - } - } - }); - if (temp != 1 ) { - head.appendChild( tag ); - } + self.add_ldn_script(self.apikey); } }); }); @@ -131,7 +114,6 @@ openerp.web_linkedin = function(instance) { e.preventDefault(); e.stopPropagation(); e.stopImmediatePropagation(); - } else { this.APIKeyWarning(); e.preventDefault(); @@ -166,6 +148,8 @@ openerp.web_linkedin = function(instance) { $("#register").click(function() { var key = $("#apikey").val(); if(key){ + //self.apikey = key; + self.add_ldn_script(key); var user = new instance.web.DataSet(self, "res.users"); user.call("set_linkedin_api_key", [key]); self.dialog.remove(); @@ -647,6 +631,29 @@ openerp.web_linkedin = function(instance) { this.$element.find('#linkedindefault').show(); } } + }, + // Add script of linkedin lib in head + add_ldn_script: function(key){ + var self = this; + self.apikey = key; + var head = document.head || document.getElementsByTagName('head')[0]; + var tag = document.createElement('script'); + tag.setAttribute('id', 'addedScript'); + tag.type = 'text/javascript'; + tag.src = "http://platform.linkedin.com/in.js"; + tag.innerHTML = 'api_key : '+self.apikey+'\n'; + tag.innerHTML = tag.innerHTML + 'authorize : true'; + var temp = 0; + $(head).find('script').each( function(i,val) { + if ($(val).attr('src')) { + if ($(val).attr('src') == "http://platform.linkedin.com/in.js") { + temp = 1; + } + } + }); + if (temp != 1 ) { + head.appendChild( tag ); + } } }); }; -- cgit v1.2.3 From 6f6e8c08b5398645a911464dcd101e7b299a5dc4 Mon Sep 17 00:00:00 2001 From: "Jiten (OpenERP)" Date: Wed, 27 Jun 2012 19:15:09 +0530 Subject: [IMP] Improved linkedin people search based on firstname and lastname. bzr revid: jra@tinyerp.com-20120627134509-910cx7ah3k73r2w9 --- addons/web_linkedin/static/src/js/linkedin.js | 42 ++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 7 deletions(-) (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index 34caf29c68a..bd7de27bb22 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -90,13 +90,41 @@ openerp.web_linkedin = function(instance) { if (self.$element.find("input").val()) { self.$element.find('#loader').show(); $('.linkedin_icon').css('display', 'none'); + var firstNames = []; + var lastNames = []; + var text = self.$element.find("input").val().split(' '); /* People Search */ - IN.API.Raw("/people-search:(people:(id,first-name,last-name,picture-url,public-profile-url,formatted-name,location,phone-numbers,im-accounts,main-address,headline))") - .params({ - "keywords": self.$element.find("input").val(), - "count" : 4 - }) - .result( self.do_fetch_detail ); + if (text.length == 2) { + firstNames.push(text[0]); + lastNames.push(text[1]); + IN.API.Raw("/people-search:(people:(id,first-name,last-name,picture-url,public-profile-url,formatted-name,location,phone-numbers,im-accounts,main-address,headline))") + .params({ + "first-name": firstNames[0], + "last-name": lastNames[0], + "count" : 4 + }) + .result( self.do_fetch_detail ); + IN.API.Raw("/people-search:(people:(id,first-name,last-name,picture-url,public-profile-url,formatted-name,location,phone-numbers,im-accounts,main-address,headline))") + .params({ + "first-name": lastNames[0], + "last-name": firstNames[0], + "count" : 4 + }) + .result( self.do_fetch_detail ); + } else { + IN.API.Raw("/people-search:(people:(id,first-name,last-name,picture-url,public-profile-url,formatted-name,location,phone-numbers,im-accounts,main-address,headline))") + .params({ + "first-name": self.$element.find("input").val(), + "count" : 4 + }) + .result( self.do_fetch_detail ); + IN.API.Raw("/people-search:(people:(id,first-name,last-name,picture-url,public-profile-url,formatted-name,location,phone-numbers,im-accounts,main-address,headline))") + .params({ + "last-name": self.$element.find("input").val(), + "count" : 4 + }) + .result( self.do_fetch_detail ); + } /* Company Search */ IN.API.Raw("/company-search:(companies:(id,name,description,industry,logo-url,website-url,locations,twitter-id))") .params({ @@ -208,7 +236,7 @@ openerp.web_linkedin = function(instance) { this.resultcompany = result; } this.removeTemplate( 1 ); - if (this.msg_Counter == 2) { + if (this.msg_Counter == 3) { this.notification.warn(_t("Linkedin Search"), _t("Record Not Found.")); this.$element.find('#loader').hide(); self.linkedin_icon_color(); -- cgit v1.2.3 From 1cbc04c7d7a9b2bf8019fba445b8866cddcdfee4 Mon Sep 17 00:00:00 2001 From: "Jiten (OpenERP)" Date: Fri, 29 Jun 2012 14:45:19 +0530 Subject: [IMP] Improved text for api key on partner form and general settings. bzr revid: jra@tinyerp.com-20120629091519-w64wlnep01ooq8a9 --- addons/web_linkedin/static/src/xml/linkedin.xml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml index bbe077edc82..bf31693557b 100644 --- a/addons/web_linkedin/static/src/xml/linkedin.xml +++ b/addons/web_linkedin/static/src/xml/linkedin.xml @@ -39,17 +39,20 @@ for all users of your system.


    -

    1) Go to : +

    1) Go to this URL: https://www.linkedin.com/secure/developer

    -

    2) Log into LinkedIn if not already done

    -

    3) Click on "Add a new application"

    -

    4) Fill in the "Application Info" form with the following data:

    -

    - Integration URL: "https://yourcompany.my.openerp.com"

    -

    - Javascript API domain: "yourcompany.my.openerp.com"

    -

    5) Copy the API key here: +

    2) Log you into LinkedIn if you din't yet

    +
    +3) Add New Application and fill the form,
+    - JavaScript API Domain is Your domain name 
+        (e.g. https://yourcompany.my.openerp.com),
+    - You can give multiple domain (e.g. yourcompany.my.openerp.com),
+    - programming tools is Javascript
+
    +

    4) Copy the API key here:

    -- cgit v1.2.3 From a6a5bc90c7b5720492ba1107a9f3fecf25d59ec2 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Mon, 16 Jul 2012 17:17:39 +0200 Subject: [IMP] changed some usage of values bzr revid: nicolas.vanhoren@openerp.com-20120716151739-fewh5uo3kny2uqdd --- addons/web_linkedin/static/src/js/linkedin.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index bd7de27bb22..c23bbfff353 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -32,7 +32,7 @@ openerp.web_linkedin = function(instance) { this.notification.appendTo(this.$element); this.$element.find(".linkedin_icon").click( this.do_load_linkedin ); this.removeTemplate(); - if(this.view.fields['name'].get_value()!=false){ + if(this.get('value') != false){ /* if value get then display button of profile url */ if (this.view.fields['profile_id'].get_value() || this.view.datarecord['profile_id']) { this.setTemplate(this.view.datarecord['profile_id'] , false ); @@ -58,7 +58,7 @@ openerp.web_linkedin = function(instance) { } } else { this.removeTemplate(); - if(this.view.fields['name'].get_value()!=false){ + if(this.get('value') != false){ var tagtr = document.createElement('tr'); tagtr.id = "profiletwittor-tr"; this.$element.append(tagtr); -- cgit v1.2.3 From 759180579e769c800c6358fa4a8f18d93ba12b99 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Mon, 30 Jul 2012 18:53:32 +0200 Subject: [IMP] did some cleaning bzr revid: nicolas.vanhoren@openerp.com-20120730165332-bx6pqly2svdbig8p --- addons/web_linkedin/static/src/css/linkedin.css | 56 ------------------------- 1 file changed, 56 deletions(-) (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/css/linkedin.css b/addons/web_linkedin/static/src/css/linkedin.css index 519a28badcb..e69de29bb2d 100644 --- a/addons/web_linkedin/static/src/css/linkedin.css +++ b/addons/web_linkedin/static/src/css/linkedin.css @@ -1,56 +0,0 @@ -.ul-ldn-dropdown { - list-style: none outside none; - padding: 1px; - max-height: 500px; - margin: 0px; - background-color: rgb(255, 255, 255); - border: 1px solid rgb(153, 153, 153); -} -.li-ldn-dropdown { - margin: 0px; - display: block; - cursor: default; - padding: 3px; - border: 1px solid rgb(255, 255, 255); - background-color: transparent; -} -.li-ldn-dropdown td{ - font-size:10px; - font-weight:normal; - padding: 2px 2px 0px; -} - -.li-ldn-dropdown:hover { - margin: 0px; - display: block; - cursor: pointer; - border: 1px solid rgb(10, 36, 106); - background-color: rgb(182, 189, 210) -} - -.search-box { - background: none repeat scroll 0 0%, -moz-linear-gradient(#EFEFEF, #D8D8D8) repeat scroll 0 0 transparent; - background: none repeat scroll 0 0%, -webkit-linear-gradient(#EFEFEF, #D8D8D8) repeat scroll 0 0 transparent; - border: 1px solid #ABABAB; - border-radius: 3px 3px 3px 3px; - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset; - max-height: 450px; -} -#apikey{ - background-color: #D2D2FF; -} -.btn_api{ - background: #F66 !important; - border: 1px solid #D00 !important; - font-weight: bold; -} - -.lbl-ldnbox{ - font-size:12px; -} -#searchresults{ - -webkit-margin-start: -70px; - -moz-margin-start: -70px; - z-index: 2000; - position: absolute; -} \ No newline at end of file -- cgit v1.2.3 From fc5163b31aa8be5b59bcefde17c3593ef2712ee3 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Tue, 31 Jul 2012 11:55:10 +0200 Subject: Removed all stuff bzr revid: nicolas.vanhoren@openerp.com-20120731095510-svyw6im3mhubgitt --- .../web_linkedin/static/src/img/Linkedin_blue.png | Bin 5435 -> 0 bytes .../web_linkedin/static/src/img/Linkedin_grey.png | Bin 2748 -> 0 bytes addons/web_linkedin/static/src/img/apikey.png | Bin 26023 -> 0 bytes .../static/src/img/help_to_fill_form.png | Bin 63353 -> 0 bytes addons/web_linkedin/static/src/img/icon.png | Bin 38257 -> 0 bytes .../static/src/img/linkedin-profile.gif | Bin 2244 -> 0 bytes addons/web_linkedin/static/src/img/loading.png | Bin 5260 -> 0 bytes .../web_linkedin/static/src/img/twitt-follow.png | Bin 12908 -> 0 bytes addons/web_linkedin/static/src/js/linkedin.js | 680 +-------------------- addons/web_linkedin/static/src/xml/linkedin.xml | 146 +---- 10 files changed, 2 insertions(+), 824 deletions(-) delete mode 100644 addons/web_linkedin/static/src/img/Linkedin_blue.png delete mode 100644 addons/web_linkedin/static/src/img/Linkedin_grey.png delete mode 100644 addons/web_linkedin/static/src/img/apikey.png delete mode 100644 addons/web_linkedin/static/src/img/help_to_fill_form.png delete mode 100644 addons/web_linkedin/static/src/img/icon.png delete mode 100644 addons/web_linkedin/static/src/img/linkedin-profile.gif delete mode 100644 addons/web_linkedin/static/src/img/loading.png delete mode 100644 addons/web_linkedin/static/src/img/twitt-follow.png (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/img/Linkedin_blue.png b/addons/web_linkedin/static/src/img/Linkedin_blue.png deleted file mode 100644 index c37d0218f7d..00000000000 Binary files a/addons/web_linkedin/static/src/img/Linkedin_blue.png and /dev/null differ diff --git a/addons/web_linkedin/static/src/img/Linkedin_grey.png b/addons/web_linkedin/static/src/img/Linkedin_grey.png deleted file mode 100644 index 726e012f220..00000000000 Binary files a/addons/web_linkedin/static/src/img/Linkedin_grey.png and /dev/null differ diff --git a/addons/web_linkedin/static/src/img/apikey.png b/addons/web_linkedin/static/src/img/apikey.png deleted file mode 100644 index 423b732b502..00000000000 Binary files a/addons/web_linkedin/static/src/img/apikey.png and /dev/null differ diff --git a/addons/web_linkedin/static/src/img/help_to_fill_form.png b/addons/web_linkedin/static/src/img/help_to_fill_form.png deleted file mode 100644 index 4962d272c3a..00000000000 Binary files a/addons/web_linkedin/static/src/img/help_to_fill_form.png and /dev/null differ diff --git a/addons/web_linkedin/static/src/img/icon.png b/addons/web_linkedin/static/src/img/icon.png deleted file mode 100644 index 119f74abdd3..00000000000 Binary files a/addons/web_linkedin/static/src/img/icon.png and /dev/null differ diff --git a/addons/web_linkedin/static/src/img/linkedin-profile.gif b/addons/web_linkedin/static/src/img/linkedin-profile.gif deleted file mode 100644 index e347e5e3ff8..00000000000 Binary files a/addons/web_linkedin/static/src/img/linkedin-profile.gif and /dev/null differ diff --git a/addons/web_linkedin/static/src/img/loading.png b/addons/web_linkedin/static/src/img/loading.png deleted file mode 100644 index 5ab0089fccb..00000000000 Binary files a/addons/web_linkedin/static/src/img/loading.png and /dev/null differ diff --git a/addons/web_linkedin/static/src/img/twitt-follow.png b/addons/web_linkedin/static/src/img/twitt-follow.png deleted file mode 100644 index 684813a1ee4..00000000000 Binary files a/addons/web_linkedin/static/src/img/twitt-follow.png and /dev/null differ diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index c23bbfff353..d1b163f45ad 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -5,684 +5,6 @@ openerp.web_linkedin = function(instance) { var QWeb = instance.web.qweb; var _t = instance.web._t; - instance.web.form.widgets.add( - 'Linkedin', 'instance.web_linkedin.Linkedin'); - instance.web_linkedin.Linkedin = instance.web.form.FieldChar.extend({ - template: 'Linkedin', - isAuthorized: false, - render_value: function() { - this._super(); - var self = this; - this.$element.find('#loader').hide(); - if (!this.get("effective_readonly")) { - this._super(); - self.user = new instance.web.DataSetSearch(self, 'res.users', null, null) - .read_slice(['id','name','company_id'], {"domain": [['id','=',self.session.uid]]}).then(function(results) { - self.company_id = results[0].company_id[0]; - self.company = new instance.web.DataSetSearch(self, 'res.company', null, null) - .read_slice(['linkedin_api_key','name'], {"domain": [['id','=',self.company_id]]}).then(function(records) { - self.apikey = records[0].linkedin_api_key; - if (self.apikey) { - self.add_ldn_script(self.apikey); - } - }); - }); - self.linkedin_icon_color(); - this.notification = new instance.web.Notification(this); - this.notification.appendTo(this.$element); - this.$element.find(".linkedin_icon").click( this.do_load_linkedin ); - this.removeTemplate(); - if(this.get('value') != false){ - /* if value get then display button of profile url */ - if (this.view.fields['profile_id'].get_value() || this.view.datarecord['profile_id']) { - this.setTemplate(this.view.datarecord['profile_id'] , false ); - } - /* if value get then display button of twitter */ - if (this.view.fields['twitter_id'].get_value() || this.view.datarecord['twitter_id']) { - this.setTemplate( false, this.view.datarecord['twitter_id']); - } - } - if (this.view.datarecord['linkedin_id']) { - if (this.view.datarecord['profile_id'] && !this.view.datarecord['twitter_id']) { - if (this.$element.find('#twitterid')) { - this.$element.find('#twitterid').remove(); - } - } - else if (!this.view.datarecord['profile_id'] && this.view.datarecord['twitter_id']) { - if (this.$element.find('#profileid')) { - this.$element.find('#profileid').remove(); - } - } - }else{ - this.removeTemplate(); - } - } else { - this.removeTemplate(); - if(this.get('value') != false){ - var tagtr = document.createElement('tr'); - tagtr.id = "profiletwittor-tr"; - this.$element.append(tagtr); - /* if value get then display button of profile url */ - if (this.view.fields['profile_id'] && this.view.datarecord['profile_id']) { - this.setTemplate( this.view.datarecord['profile_id'] , false ); - } - /* if value get then display button of twitter */ - if (this.view.fields['twitter_id'] && this.view.datarecord['twitter_id']) { - this.setTemplate( false, this.view.datarecord['twitter_id'] ); - } - } - } - }, - /* Load Linkedin Data On search */ - do_load_linkedin: function( e ) { - var self = this; - this.msg_Counter=0; /* used to display notification, when record not found on Linkedin search */ - this.removeTemplate( 1 ); - if (this.apikey){ - if (IN.ENV.auth) { - if (IN.ENV.auth.api_key != this.apikey){ - return false; - } - }else{ - return false; - } - if (IN.ENV.auth.oauth_token) { - if (self.$element.find("input").val()) { - self.$element.find('#loader').show(); - $('.linkedin_icon').css('display', 'none'); - var firstNames = []; - var lastNames = []; - var text = self.$element.find("input").val().split(' '); - /* People Search */ - if (text.length == 2) { - firstNames.push(text[0]); - lastNames.push(text[1]); - IN.API.Raw("/people-search:(people:(id,first-name,last-name,picture-url,public-profile-url,formatted-name,location,phone-numbers,im-accounts,main-address,headline))") - .params({ - "first-name": firstNames[0], - "last-name": lastNames[0], - "count" : 4 - }) - .result( self.do_fetch_detail ); - IN.API.Raw("/people-search:(people:(id,first-name,last-name,picture-url,public-profile-url,formatted-name,location,phone-numbers,im-accounts,main-address,headline))") - .params({ - "first-name": lastNames[0], - "last-name": firstNames[0], - "count" : 4 - }) - .result( self.do_fetch_detail ); - } else { - IN.API.Raw("/people-search:(people:(id,first-name,last-name,picture-url,public-profile-url,formatted-name,location,phone-numbers,im-accounts,main-address,headline))") - .params({ - "first-name": self.$element.find("input").val(), - "count" : 4 - }) - .result( self.do_fetch_detail ); - IN.API.Raw("/people-search:(people:(id,first-name,last-name,picture-url,public-profile-url,formatted-name,location,phone-numbers,im-accounts,main-address,headline))") - .params({ - "last-name": self.$element.find("input").val(), - "count" : 4 - }) - .result( self.do_fetch_detail ); - } - /* Company Search */ - IN.API.Raw("/company-search:(companies:(id,name,description,industry,logo-url,website-url,locations,twitter-id))") - .params({ - "keywords": self.$element.find("input").val(), - "count" : 4 - }) - .result( self.do_fetch_detail ); - }else{ - this.notification.warn(_t("Linkedin Search"), _t("Please Enter Required Field.")); - } - } - else { - self.do_authorize(); - } - e.preventDefault(); - e.stopPropagation(); - e.stopImmediatePropagation(); - } else { - this.APIKeyWarning(); - e.preventDefault(); - e.stopPropagation(); - e.stopImmediatePropagation(); - return false; - } - }, - do_authorize: function(resultCallback){ - this.check_authorized(); - if (this.isAuthorized == false){ - IN.User.authorize(resultCallback); - } - }, - check_authorized: function(){ - this.isAuthorized = IN.User.isAuthorized(); - }, - APIKeyWarning: function(e) { - var self = this; - this.dialog = instance.web.dialog($(QWeb.render("Register.Linkedin")), { - title: _t("Connect to LinkedIn"), - modal: true, - width : 700, - height:500, - close: function(){ self.dialog.remove();}, - buttons:[ - { - text: _t("Cancel"), - click: function() { self.dialog.remove(); } - }] - }); - $("#register").click(function() { - var key = $("#apikey").val(); - if(key){ - //self.apikey = key; - self.add_ldn_script(key); - var user = new instance.web.DataSet(self, "res.users"); - user.call("set_linkedin_api_key", [key]); - self.dialog.remove(); - //self.__parentedParent.reload(); - } - else { - $("#apikey").css({'background-color':'#F66 '}) - self.notification.warn(_t("Linkedin Search"), _t("Please Enter Required Key.")); - } - - }) - }, - setTemplate: function( URL, AccountName ) { - if(AccountName){ - var AccountName = AccountName.replace(/[^a-zA-Z 0-9]+/g, ''); - Twitt = "https://twitter.com/intent/follow?original_referer=http%3A%2F%2Flocalhost%3A8069%2Fweb%2Fwebclient%2Fhome&screen_name="+AccountName+"&source=followbutton&variant=2.0" - this.$element.find('tr#profiletwittor-tr').append(QWeb.render('TwitterURL',{'URLID': Twitt, 'account': AccountName})) - }else if(URL){ - this.$element.find('tr#profiletwittor-tr').append(QWeb.render('ProfileURL',{'URLID': URL })) - } - }, - removeTemplate: function( flag ) { - if (flag) { - this.$element.find('#searchresults').remove(); - } else { - if (this.$element.find('#profileid')) { - this.$element.find('#profileid').remove(); - } - if (this.$element.find('#twitterid')) { - this.$element.find('#twitterid').remove(); - } - } - }, - /* Fetch Result from Linkedin and set in searchbox */ - do_fetch_detail: function(result, metadata) { - var self = this; - if (result.people) { - if (result.people._total==0) { - this.msg_Counter++; - } - var count = 0; - for (i in result.people.values) { - var temp = self.validName(result.people.values[i].firstName, result.people.values[i].lastName) - if (temp) { - count++; - } - } - if (count == 4 || count==result.people._total) { - result.people._total = 0; - } - this.resultcontact = result; - }else if (result.companies) { - if (result.companies._total == 0) { - this.msg_Counter++; - } - this.resultcompany = result; - } - this.removeTemplate( 1 ); - if (this.msg_Counter == 3) { - this.notification.warn(_t("Linkedin Search"), _t("Record Not Found.")); - this.$element.find('#loader').hide(); - self.linkedin_icon_color(); - } else { - if (this.resultcontact || this.resultcompany) { - this.$element.find('#linkedin-field-name').append(QWeb.render( 'Linkedincontact', {'result' : this.resultcontact, 'resultcompany' : this.resultcompany})) ; - } - } - if(this.$element.find('#searchresults .search-box ul li')){ - this.$element.find('#loader').hide(); - self.linkedin_icon_color(); - } - this.$element.find('#searchresults .search-box ul li').click( function() { - self.getdata( this ); - }); - $(document).click( function() { - self.removeTemplate( 1 ); - }); - }, - /* Selected record's data fetched */ - getdata: function( e ) { - var self = this; - if (this.resultcontact) { - for (i in this.resultcontact.people.values) { - if (self.resultcontact.people.values[i].id == $(e).attr('id')) { - self.removeTemplate( 1 ); - this.getTwitterAccount( self.resultcontact.people.values[i] ) - } - } - } - if(this.resultcompany){ - for ( i in this.resultcompany.companies.values ) { - if ( self.resultcompany.companies.values[i].id == $(e).attr('id') ) { - self.removeTemplate( 1 ); - self.map_values(self.resultcompany.companies.values[i]); - } - } - } - }, - /* Based on Linkedin Id of record fetch Twitter Account Detail for People */ - getTwitterAccount: function( values, flag, mainfield ){ - var self = this; - IN.API.Profile(values.id).fields('twitter-accounts') - .result(function(acname){ - values.twitterAccounts = acname.values[0].twitterAccounts - if(flag){ - self.map_values(values, flag, mainfield); - }else{ - self.map_values(values); - } - }); - }, - /* Mapping of Linkedin Fields with res.partner Fields - linkedinrecord : contains linkedin record's data - flag : indicates mapping of People search record or for company's contacts/connections (people) - if(flag) mapping for contacts of company - if(!flag) mapping for people search - mainfield : class of child_ids field - */ - map_values: function (linkedinrecord, flag, mainfield){ - var self = this, tempdata = {}, temp_data = 0, id = this.view.datarecord.id; - _(this.view.fields).each(function (field, f) { - if (f=='name') { - if (!flag) { - if (linkedinrecord.formattedName) { - field.set_value(linkedinrecord['formattedName'] || false); - } else if(linkedinrecord.name) { - field.set_value(linkedinrecord['name'] || false); - } - } else { - tempdata[f] = linkedinrecord.firstName+' '+linkedinrecord.lastName; - } - } - else if (f=='property_account_payable') { - if(flag == 1)tempdata[f] = field.get_value() - } - else if (f=='property_account_receivable') { - if(flag == 1)tempdata[f] = field.get_value() - } - else if (f=='type') { - (flag == 1) ? tempdata[f] = field.get_value() : field.get_value(); - } - else if (f=='linkedin_id') { - (flag == 1) ? tempdata[f] = linkedinrecord['id'] : field.set_value(linkedinrecord['id']); - } - else if (f=='profile_id') { - if (linkedinrecord.publicProfileUrl) { - (flag == 1) ? tempdata[f] = linkedinrecord.publicProfileUrl : field.set_value(linkedinrecord.publicProfileUrl); - } else { - field.set_value(false); - tempdata[f] = false; - } - } - else if (f=='twitter_id') { - if (linkedinrecord.twitterAccounts && linkedinrecord.twitterAccounts._total >= 1) { - (flag == 1) ? tempdata[f] = linkedinrecord.twitterAccounts.values[0].providerAccountName : field.set_value(linkedinrecord.twitterAccounts.values[0].providerAccountName); - }else if (linkedinrecord.twitterId) { - (flag == 1) ? tempdata[f] = linkedinrecord.twitterId : field.set_value(linkedinrecord.twitterId); - } else { - (flag == 1) ? tempdata[f] = false : field.set_value(false); - } - } - else if (f=='mobile') { - if (!flag && linkedinrecord.phoneNumbers && linkedinrecord['phoneNumbers']._total>=1 && linkedinrecord['phoneNumbers'].values[0].phoneType == "mobile") { - field.set_value( linkedinrecord['phoneNumbers'].values[0].phoneNumber || false ); - }else if (flag == 1) { - tempdata[f] = field.get_value(); - } else { - field.set_value(false); - } - } - else if (f=='phone') { - if (!flag && linkedinrecord.phoneNumbers && linkedinrecord['phoneNumbers']._total>=1 && linkedinrecord['phoneNumbers'].values[0].phoneType != "mobile") { - field.set_value(linkedinrecord['phoneNumbers'].values[0].phoneNumber || false); - } else if(flag == 1) { - tempdata[f] = field.get_value(); - } else { - field.set_value(false); - } - } - else if (f=='email') { - if (!flag && linkedinrecord.imAccounts && linkedinrecord['imAccounts']._total>=1) { - field.set_value(linkedinrecord['imAccounts'].values[0].imAccountName); - } else if(flag == 1) { - tempdata[f] = field.get_value(); - } else { - field.set_value(false); - } - } - else if (f=='photo') { - if (!flag) { - if (linkedinrecord.pictureUrl && linkedinrecord['pictureUrl']) { - /* Fetch binary data from URL for People */ - self.rpc('/web_linkedin/binary/url2binary',{'url':linkedinrecord['pictureUrl']},function(data){ - field.set_value(data); - }); - } else if (linkedinrecord.logoUrl && linkedinrecord['logoUrl']) { - /* Fetch binary data from URL for Company */ - self.rpc('/web_linkedin/binary/url2binary',{'url':linkedinrecord['logoUrl']},function(data){ - field.set_value(data); - }); - } else { - field.set_value(false); - } - } - else{ - if (linkedinrecord['pictureUrl']) { - temp_data = 1; - /* Fetch binary data from URL for contact of Company */ - self.rpc('/web_linkedin/binary/url2binary',{'url':linkedinrecord['pictureUrl']}).done(function(res){ - tempdata[f] = res; - self.set_o2mdata(tempdata,mainfield) - }); - } else { - tempdata[f] = "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 TkSuQmCC"; - } - } - } - else if (f=='street') { - if (!flag && linkedinrecord.mainAddress && linkedinrecord['mainAddress']) { - field.set_value(linkedinrecord['mainAddress']); - } else if(flag == 1) { - tempdata[f] = field.get_value(); - } else { - field.set_value(false); - } - } - else if (f=='country_id') { - if (!flag && linkedinrecord.location && linkedinrecord['location']) { - field.field.domain = [['code', '=', linkedinrecord['location'].country['code'].toUpperCase()]]; - (new instance.web.DataSetSearch(self, field.field.relation,field.field.context,field.field.domain)).read_slice(['id','name'],{}).then(function(res){ - field.original_value = [res[0].id, res[0].name]; - field.set_value(res[0].id) - }) - } else if (!flag && linkedinrecord.locations && linkedinrecord.locations._total>0) { - if (linkedinrecord.locations.values[0].address['country-code']) { - field.field.domain = ['code', '=', linkedinrecord.locations.values[0].address['country-code'].toUpperCase()]; - (new instance.web.DataSetSearch(self, field.field.relation,field.field.context,field.field.domain)).read_slice(['id','name'],{}).then(function(res){ - field.original_value = [res[0].id, res[0].name]; - field.set_value(res[0].id) - }) - } else { - field.set_value(false); - } - } else if(flag == 1) { - tempdata[f] = field.get_value(); - } else { - field.set_value(false); - } - } - else if (f=='city') { - if (!flag && linkedinrecord.location && linkedinrecord['location']) { - field.set_value(linkedinrecord['location'].name.split(' ')[0] || false); - } else if (!flag && linkedinrecord.locations && linkedinrecord.locations._total>0) { - if (linkedinrecord.locations.values[0].address['city']) { - field.set_value(linkedinrecord.locations.values[0].address['city']); - } else { - field.set_value(false); - } - } else if (flag == 1) { - tempdata[f] = field.get_value(); - } else { - field.set_value(false); - } - } - else if (f=='website') { - if (!flag && linkedinrecord.websiteUrl) { - field.set_value(linkedinrecord['websiteUrl'] || false); - } else if (flag == 1) { - tempdata[f] = field.get_value(); - } else { - field.set_value(false); - } - } - else if (f=='customer') { - if(flag == 1)tempdata[f] = true; - } - else if (f=='supplier') { - } - else if (f=='active') { - (flag == 1) ? tempdata[f] = true : field.set_value(true); - } - else if (f=='is_company') { - if (!flag && linkedinrecord.formattedName) { - field.set_value(false); - } else { - field.set_value(true); - tempdata[f] = false; - } - } - else if (f=='zip') { - if (!flag && linkedinrecord.locations && linkedinrecord.locations._total>0) { - if (linkedinrecord.locations.values[0].address['postalCode']) { - field.set_value(linkedinrecord.locations.values[0].address['postalCode']); - } else { - field.set_value(false); - } - }else if (flag == 1) { - tempdata[f] = field.get_value(); - } else { - field.set_value(false); - } - } - else if (f=='parent_id') { - if (!flag && linkedinrecord.formattedName) { - field.set_value(false); - } else if (!flag && linkedinrecord.name) { - field.set_value(false); - } else { - if (linkedinrecord.formattedName) { - tempdata[f] = [id,self.view.fields['name'].get_value()]; - } - } - } - else if (f=='fax') { - if (!flag && linkedinrecord.locations && linkedinrecord.locations._total>0) { - if (linkedinrecord.locations.values[0].contactInfo['fax']) { - field.set_value(linkedinrecord.locations.values[0].contactInfo['fax']); - } else { - field.set_value(false); - } - } else if (flag == 1) { - tempdata[f] = field.get_value(); - } else { - field.set_value(false); - } - } - else if (f=='use_parent_address') { - (flag == 1) ? tempdata[f] = true : field.set_value(false); - } - else if (f=='child_ids') { - /* For Company Set value of child_ids field */ - if (!flag && linkedinrecord.name) { - self.$element.find('#loader').show(); - $('.linkedin_icon').css('display', 'none'); - /* Fetch contact of Company */ - IN.API.Raw("/people-search:(people:(id,first-name,last-name,formatted-name,picture-url,publicProfileUrl,phone-numbers,im-accounts,main-address,location,relation-to-viewer:(related-connections)))") - //"id", "firstName", "lastName", "pictureUrl", "publicProfileUrl", "formatted-name", "headline", "location", "industry", "languages", "phone-numbers", "im-accounts", "main-address" - .params({ - "company-name" : linkedinrecord.name, - "current-company": true, - "count" : 25 - }) - .result( function (getresult){ - if(getresult.people._total==0){ - self.$element.find('#loader').hide(); - if(self.view.fields['linkedin_id']){ - if(self.view.datarecord['linkedin_id']){ - self.$element.find('#linkedindefault').hide(); - self.$element.find('#linkedinrecord').show(); - }else{ - self.$element.find('#linkedinrecord').hide(); - self.$element.find('#linkedindefault').show(); - } - } - } - self.totalids = [],self.updteids = []; - _(field.dataset.ids).each( function(i) { - if (typeof(i)=="number") { - self.totalids.push(i); - var mobile = self.view.fields['mobile'].get_value(); - var phone = self.view.fields['phone'].get_value(); - var email = self.view.fields['email'].get_value(); - var fax = self.view.fields['fax'].get_value(); - var website = self.view.fields['website'].get_value(); - var zip = self.view.fields['zip'].get_value(); - var city = self.view.fields['city'].get_value(); - var country_id = self.view.fields['country_id'].get_value(); - var street = self.view.fields['street'].get_value(); - field.dataset.write(i,{'mobile':mobile,'phone':phone,'email':email,'fax':fax,'website':website,'zip':zip,'city':city,'country_id':country_id,'street':street},{}); - } - }); - field.dataset.ids = self.totalids; - var counter = 0;/* Indicates All searched records are Invalid or valid */ - self.t_count=0; - self.o2m_count = 0; - for (i in getresult.people.values) { - var connectTemp = self.validName(getresult.people.values[i].firstName, getresult.people.values[i].lastName) - if (connectTemp) { - counter++; - } else { - self.t_count++; - self.getTwitterAccount(getresult.people.values[i], 1, field); - } - } - if (getresult.people._count) { - var total_Count = getresult.people._count; - }else if (getresult.people._total) { - var total_Count = getresult.people._total; - } - /* If counter == total no. of people then all searched records are invalid */ - if (counter == total_Count) { - field.dataset.to_create = []; - field.dataset.ids = []; - field.reload_current_view(); - }else if(getresult.people._total == 0 || getresult.people._count == 0){ - field.dataset.ids = self.totalids; - field.reload_current_view(); - } - }); - } - /* For People Set value of child_ids field */ - else if (!flag && linkedinrecord.formattedName) { - field.set_value(false); - field.set({'invisible':true}); - } - /* For Contact of company Set value of child_ids field */ - else { - tempdata[f] = false; - } - } - else { - (flag == 1) ? tempdata[f] = false : field.set_value(false); - } - field._dirty_flag = true; - field.on('changed_value', self, function() { - if (!flag) { - self.view.do_onchange(field); - self.view.on_form_changed(true); - self.view.do_notify_change(); - } - }); - }); - if (!flag) { - this.removeTemplate(); - if (linkedinrecord.publicProfileUrl) { - this.setTemplate( linkedinrecord.publicProfileUrl , false ); - } - if (linkedinrecord.twitterId) { - this.setTemplate( false , linkedinrecord.twitterId ); - } - if (linkedinrecord.twitterAccounts && linkedinrecord.twitterAccounts._total >= 1) { - this.setTemplate( false , linkedinrecord.twitterAccounts.values[0].providerAccountName ); - } - } - if (flag && temp_data == 0) { - self.set_o2mdata(tempdata, mainfield); - } - }, - /* Update existing value of child_ids field */ - set_childids: function( ids ) { - var self = this; - _(ids).each(function(i){ - self.view.fields['child_ids'].dataset.set_ids(self.view.fields['child_ids'].dataset.ids.concat([i])); - self.view.fields['child_ids'].dataset.write(i, {"parent_id":false}, {}); - }); - }, - /* Set/create o2m contacts of child_ids field */ - set_o2mdata: function(data,field){ - var self = this; - self.o2m_count++; - field.dataset.create(data).then( function(r) { - self.totalids.push(r.result); - field.dataset.set_ids(field.dataset.ids.concat([r.result])); - field.dataset.on_change(); - }).then(); - field.dataset.ids = self.totalids; - field.reload_current_view(); - if (self.t_count == self.o2m_count) { - self.$element.find('#loader').hide(); - self.linkedin_icon_color(); - } - }, - /* Name of Searched Linkedin Record is valid or Not */ - validName: function(fname, lname){ - if ((fname == "Private" || fname == "private") || (lname == "Private" || lname == "private") || (fname == "" && lname == "")) { - return true; - } else { - return false; - } - }, - // Linkedin icon color changed to distinguise record based on linkedin or not. - linkedin_icon_color: function(e) { - if(this.view.fields['linkedin_id']){ - if(this.view.datarecord['linkedin_id']){ - this.$element.find('#linkedindefault').hide(); - this.$element.find('#linkedinrecord').show(); - }else{ - this.$element.find('#linkedinrecord').hide(); - this.$element.find('#linkedindefault').show(); - } - } - }, - // Add script of linkedin lib in head - add_ldn_script: function(key){ - var self = this; - self.apikey = key; - var head = document.head || document.getElementsByTagName('head')[0]; - var tag = document.createElement('script'); - tag.setAttribute('id', 'addedScript'); - tag.type = 'text/javascript'; - tag.src = "http://platform.linkedin.com/in.js"; - tag.innerHTML = 'api_key : '+self.apikey+'\n'; - tag.innerHTML = tag.innerHTML + 'authorize : true'; - var temp = 0; - $(head).find('script').each( function(i,val) { - if ($(val).attr('src')) { - if ($(val).attr('src') == "http://platform.linkedin.com/in.js") { - temp = 1; - } - } - }); - if (temp != 1 ) { - head.appendChild( tag ); - } - } - }); + }; // vim:et fdc=0 fdl=0: diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml index bf31693557b..ff4d920d031 100644 --- a/addons/web_linkedin/static/src/xml/linkedin.xml +++ b/addons/web_linkedin/static/src/xml/linkedin.xml @@ -1,150 +1,6 @@ - - -
    - +
    - +
    - - - - - -
    - - -
    - - - Search on LinkedIn - Search on LinkedIn - - - -
    -
    - + - - - - View profile on LinkedIn - - - - - -
    -

    Connect OpneERP to LinkedIn to allow synchronizing companies and people with LinkedIn contacts in order to
    - get their data automatically (photos, address, news). You just need to setup the API key once, and it will work
    - for all users of your system. -

    -
    -

    1) Go to this URL: - - https://www.linkedin.com/secure/developer - -

    -

    2) Log you into LinkedIn if you din't yet

    -
    -3) Add New Application and fill the form,
-    - JavaScript API Domain is Your domain name 
-        (e.g. https://yourcompany.my.openerp.com),
-    - You can give multiple domain (e.g. yourcompany.my.openerp.com),
-    - programming tools is Javascript
-
    -

    4) Copy the API key here: - -

    -
    -     - - - - - Follow - - - - -
    Record Not Found.
    -     - -
    -
    - - - - - - - - -
    - - - -
    -     		-
      - -
    • - - - - - -
      - - - - - - - - -
      - -
      -
      • -       -
    -
    - -
    -
    -     - - - - - - - -
    - - -
      -
    • - - - - - -
      - - - - - - - -
      - -
      -
      • -
    - - -     -         \ No newline at end of file -- cgit v1.2.3 From 050b4caa285e1361a6211ae5503882dc1b022c15 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Wed, 1 Aug 2012 15:27:33 +0200 Subject: wip bzr revid: nicolas.vanhoren@openerp.com-20120801132733-p1xjpxf005skr94o --- .../web_linkedin/static/src/img/Linkedin_blue.png | Bin 0 -> 5435 bytes addons/web_linkedin/static/src/js/linkedin.js | 68 ++++++++++++++++++++- addons/web_linkedin/static/src/xml/linkedin.xml | 4 +- 3 files changed, 70 insertions(+), 2 deletions(-) create mode 100644 addons/web_linkedin/static/src/img/Linkedin_blue.png (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/img/Linkedin_blue.png b/addons/web_linkedin/static/src/img/Linkedin_blue.png new file mode 100644 index 00000000000..c37d0218f7d Binary files /dev/null and b/addons/web_linkedin/static/src/img/Linkedin_blue.png differ diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index d1b163f45ad..d4dc2baf114 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -5,6 +5,72 @@ openerp.web_linkedin = function(instance) { var QWeb = instance.web.qweb; var _t = instance.web._t; - + + instance.web_linkedin.LinkedinTester = instance.web.Class.extend({ + init: function() { + this.api_key = "cxnr0l53n73x"; + this.linkedin_added = false; + this.linkedin_def = $.Deferred(); + }, + test_linkedin: function() { + var self = this; + return this.test_api_key().pipe(function() { + if (self.linkedin_added) + return self.linkedin_def.promise(); + var tag = document.createElement('script'); + tag.type = 'text/javascript'; + tag.src = "http://platform.linkedin.com/in.js"; + tag.innerHTML = 'api_key : ' + self.api_key + '\nauthorize : true'; + document.getElementsByTagName('head')[0].appendChild(tag); + linkedin_added = true; + $(tag).load(function() { + self.linkedin_def.resolve(); + }); + return self.linkedin_def.promise(); + }, function() { + /*return new instance.web.Model("ir.config_parameter").call("set_param", ["web.linkedin.apikey", "cxnr0l53n73x"]).pipe(function() { + return self.test_linkedin(); + });*/ + }); + }, + test_api_key: function() { + if (this.api_key) { + return $.when(); + } + return new instance.web.Model("ir.config_parameter").call("get_param", ["web.linkedin.apikey"]).pipe(function(a) { + if (a !== false) { + self.api_key = a; + return true; + } else { + return $.Deferred().reject(); + } + }); + }, + }); + + instance.web_linkedin.tester = new instance.web_linkedin.LinkedinTester(); + + instance.web_linkedin.Linkedin = instance.web.form.FieldChar.extend({ + init: function() { + this._super.apply(this, arguments); + var self = this; + this.display_dm = new instance.web.DropMisordered(true); + this.on("linkedin_loaded", this, function() { + $("input", self.$element).after(QWeb.render("FieldChar.linkedin")); + }); + }, + initialize_content: function() { + this._super(); + var self = this; + if (! this.get("effective_readonly")) { + this.display_dm.add(instance.web_linkedin.tester.test_linkedin()).then(function() { + self.trigger("linkedin_loaded"); + }); + } else { + this.display_dm.add($.when()); + } + }, + }); + instance.web.form.widgets.add('linkedin', 'instance.web_linkedin.Linkedin'); }; // vim:et fdc=0 fdl=0: diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml index ff4d920d031..33ae10752fa 100644 --- a/addons/web_linkedin/static/src/xml/linkedin.xml +++ b/addons/web_linkedin/static/src/xml/linkedin.xml @@ -2,5 +2,7 @@ - + + Yop + \ No newline at end of file -- cgit v1.2.3 From 6f39a63957da18da62a216b50db5f4aa3137dd2d Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Thu, 2 Aug 2012 10:47:45 +0200 Subject: Did better stuff bzr revid: nicolas.vanhoren@openerp.com-20120802084745-02bahalf1q3ht1l4 --- addons/web_linkedin/static/src/js/linkedin.js | 31 +++++++++++++------------ addons/web_linkedin/static/src/xml/linkedin.xml | 3 ++- 2 files changed, 18 insertions(+), 16 deletions(-) (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index d4dc2baf114..ad8a1fa6a52 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -22,15 +22,11 @@ openerp.web_linkedin = function(instance) { tag.src = "http://platform.linkedin.com/in.js"; tag.innerHTML = 'api_key : ' + self.api_key + '\nauthorize : true'; document.getElementsByTagName('head')[0].appendChild(tag); - linkedin_added = true; + self.linkedin_added = true; $(tag).load(function() { self.linkedin_def.resolve(); }); return self.linkedin_def.promise(); - }, function() { - /*return new instance.web.Model("ir.config_parameter").call("set_param", ["web.linkedin.apikey", "cxnr0l53n73x"]).pipe(function() { - return self.test_linkedin(); - });*/ }); }, test_api_key: function() { @@ -48,6 +44,10 @@ openerp.web_linkedin = function(instance) { }, }); + /*return new instance.web.Model("ir.config_parameter").call("set_param", ["web.linkedin.apikey", "cxnr0l53n73x"]).pipe(function() { + return self.test_linkedin(); + });*/ + instance.web_linkedin.tester = new instance.web_linkedin.LinkedinTester(); instance.web_linkedin.Linkedin = instance.web.form.FieldChar.extend({ @@ -55,20 +55,21 @@ openerp.web_linkedin = function(instance) { this._super.apply(this, arguments); var self = this; this.display_dm = new instance.web.DropMisordered(true); - this.on("linkedin_loaded", this, function() { - $("input", self.$element).after(QWeb.render("FieldChar.linkedin")); - }); }, initialize_content: function() { this._super(); + var $ht = $(QWeb.render("FieldChar.linkedin")); + var $in = this.$("input"); + $in.replaceWith($ht); + this.$(".oe_linkedin_input").append($in); + this.$(".oe_linkedin_img").click(_.bind(this.search_linkedin, this)); + + }, + search_linkedin: function() { var self = this; - if (! this.get("effective_readonly")) { - this.display_dm.add(instance.web_linkedin.tester.test_linkedin()).then(function() { - self.trigger("linkedin_loaded"); - }); - } else { - this.display_dm.add($.when()); - } + this.display_dm.add(instance.web_linkedin.tester.test_linkedin()).then(function() { + debugger; + }); }, }); instance.web.form.widgets.add('linkedin', 'instance.web_linkedin.Linkedin'); diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml index 33ae10752fa..42f0ad6f851 100644 --- a/addons/web_linkedin/static/src/xml/linkedin.xml +++ b/addons/web_linkedin/static/src/xml/linkedin.xml @@ -3,6 +3,7 @@ --> - Yop + +
    \ No newline at end of file -- cgit v1.2.3 From 53f35a608c70590e38e66ebaab3d278ae2a0930a Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Fri, 3 Aug 2012 10:45:45 +0200 Subject: wip bzr revid: nicolas.vanhoren@openerp.com-20120803084545-wdaxtx1e7ewujnfy --- addons/web_linkedin/static/src/css/linkedin.css | 12 ++++++++++ addons/web_linkedin/static/src/js/linkedin.js | 32 +++++++++++++++++++++++-- addons/web_linkedin/static/src/xml/linkedin.xml | 10 ++++++-- 3 files changed, 50 insertions(+), 4 deletions(-) (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/css/linkedin.css b/addons/web_linkedin/static/src/css/linkedin.css index e69de29bb2d..ecf0d2085b6 100644 --- a/addons/web_linkedin/static/src/css/linkedin.css +++ b/addons/web_linkedin/static/src/css/linkedin.css @@ -0,0 +1,12 @@ + + +.openerp .oe_linkedin_img { + float: right; + width: 1.5em; + margin-top: -1px; + cursor: pointer; +} + +.openerp .oe_linkedin_input { + margin-right:1.5em; +} \ No newline at end of file diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index ad8a1fa6a52..b3c073a9f8b 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -11,6 +11,7 @@ openerp.web_linkedin = function(instance) { this.api_key = "cxnr0l53n73x"; this.linkedin_added = false; this.linkedin_def = $.Deferred(); + this.auth_def = $.Deferred(); }, test_linkedin: function() { var self = this; @@ -24,6 +25,9 @@ openerp.web_linkedin = function(instance) { document.getElementsByTagName('head')[0].appendChild(tag); self.linkedin_added = true; $(tag).load(function() { + IN.Event.on(IN, "auth", function() { + self.auth_def.resolve(); + }); self.linkedin_def.resolve(); }); return self.linkedin_def.promise(); @@ -42,6 +46,9 @@ openerp.web_linkedin = function(instance) { } }); }, + test_authentication: function() { + return this.auth_def.promise(); + }, }); /*return new instance.web.Model("ir.config_parameter").call("set_param", ["web.linkedin.apikey", "cxnr0l53n73x"]).pipe(function() { @@ -57,21 +64,42 @@ openerp.web_linkedin = function(instance) { this.display_dm = new instance.web.DropMisordered(true); }, initialize_content: function() { - this._super(); var $ht = $(QWeb.render("FieldChar.linkedin")); var $in = this.$("input"); $in.replaceWith($ht); this.$(".oe_linkedin_input").append($in); this.$(".oe_linkedin_img").click(_.bind(this.search_linkedin, this)); + this._super(); }, search_linkedin: function() { var self = this; this.display_dm.add(instance.web_linkedin.tester.test_linkedin()).then(function() { - debugger; + new instance.web_linkedin.LinkedinPopup(self, self.get("value")).open(); }); }, }); instance.web.form.widgets.add('linkedin', 'instance.web_linkedin.Linkedin'); + + instance.web_linkedin.LinkedinPopup = instance.web.Dialog.extend({ + template: "Linkedin.popup", + init: function(parent, text) { + this._super(parent); + this.text = text; + }, + start: function() { + this._super(); + var self = this; + this.on("authentified", this, this.authentified); + instance.web_linkedin.tester.test_authentication().then(function() { + self.trigger("authentified"); + }); + }, + authentified: function() { + IN.API.PeopleSearch().params({"last-name": this.text}).result(function(a, b, c) { + console.log("result", a); + }); + }, + }); }; // vim:et fdc=0 fdl=0: diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml index 42f0ad6f851..a68c0cf7026 100644 --- a/addons/web_linkedin/static/src/xml/linkedin.xml +++ b/addons/web_linkedin/static/src/xml/linkedin.xml @@ -3,7 +3,13 @@ --> - -
    + +
    + + +
    + +
    \ No newline at end of file -- cgit v1.2.3 From f20b92105f9a11205384748a9adba4bb97b8865a Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Fri, 3 Aug 2012 12:08:34 +0200 Subject: Added searching methods bzr revid: nicolas.vanhoren@openerp.com-20120803100834-j850v3dqv42xqc9j --- addons/web_linkedin/static/src/js/linkedin.js | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index b3c073a9f8b..ffe5db1f0de 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -86,6 +86,7 @@ openerp.web_linkedin = function(instance) { init: function(parent, text) { this._super(parent); this.text = text; + this.limit = 10; }, start: function() { this._super(); @@ -96,8 +97,30 @@ openerp.web_linkedin = function(instance) { }); }, authentified: function() { - IN.API.PeopleSearch().params({"last-name": this.text}).result(function(a, b, c) { - console.log("result", a); + var self = this; + cdef = $.Deferred(); + pdef = $.Deferred(); + IN.API.Raw(_.str.sprintf("company-search?keywords=%s&count=%d", encodeURI(this.text), this.limit)).result(function (result) { + cdef.resolve(result); + }); + IN.API.PeopleSearch().params({"keywords": this.text, "count": this.limit}).result(function(result) { + pdef.resolve(result); + }); + return $.when(cdef, pdef).then(function(companies, people) { + var lst = companies.companies.values; + var plst = people.people.values; + lst = _.initial(lst, _.min([self.limit / 2, plst.length])); + _.map(lst, function(el) { + el.__type = "company"; + return el; + }); + plst = _.first(people.people.values, self.limit - lst.length) + _.map(plst, function(el) { + el.__type = "people"; + return el; + }); + lst = lst.concat(plst); + console.log("found", lst.length, lst); }); }, }); -- cgit v1.2.3 From 56227098e4f5268a3d862fd321916e73380dfcbb Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Fri, 3 Aug 2012 14:34:48 +0200 Subject: Now print the names bzr revid: nicolas.vanhoren@openerp.com-20120803123448-jbvyc45gtb7ys7xk --- addons/web_linkedin/static/src/js/linkedin.js | 35 ++++++++++++++++++++++++- addons/web_linkedin/static/src/xml/linkedin.xml | 6 +++++ 2 files changed, 40 insertions(+), 1 deletion(-) (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index ffe5db1f0de..3ccbfce19b9 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -120,9 +120,42 @@ openerp.web_linkedin = function(instance) { return el; }); lst = lst.concat(plst); - console.log("found", lst.length, lst); + console.log("Linkedin search found:", lst.length, lst); + self.result = lst; + self.display_result(); }); }, + display_result: function() { + var self = this; + self.$element.html("
    "); + var i = 0; + var $row; + _.each(self.result, function(el) { + var pc = new instance.web_linkedin.PeopleCompany(self, el); + if (i % 5 === 0) { + $row = $("
    "); + $row.appendTo(self.$(">div")); + } + pc.appendTo($row); + pc.$element.css("display", "table-cell"); + i++; + }); + }, + }); + + instance.web_linkedin.PeopleCompany = instance.web.Widget.extend({ + template: "PeopleCompany", + init: function(parent, data) { + this._super(parent); + this.data = data; + }, + start: function() { + if (this.data.__type === "company") { + this.$("h3").text(this.data.name); + } else { // people + this.$("h3").text(_.str.sprintf("%s %s", this.data.firstName, this.data.lastName)); + } + }, }); }; // vim:et fdc=0 fdl=0: diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml index a68c0cf7026..332ab8a3175 100644 --- a/addons/web_linkedin/static/src/xml/linkedin.xml +++ b/addons/web_linkedin/static/src/xml/linkedin.xml @@ -12,4 +12,10 @@
    + +
    +

    + +

    +     \ No newline at end of file -- cgit v1.2.3 From def89041dca2aadf395677dd34dd340cc6854d45 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Fri, 3 Aug 2012 16:04:13 +0200 Subject: wip bzr revid: nicolas.vanhoren@openerp.com-20120803140413-cik08mkxcohd4698 --- addons/web_linkedin/static/src/css/linkedin.css | 16 ++++++++++++++++ addons/web_linkedin/static/src/js/linkedin.js | 24 ++++++++++++++++++++---- addons/web_linkedin/static/src/xml/linkedin.xml | 9 ++++++--- 3 files changed, 42 insertions(+), 7 deletions(-) (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/css/linkedin.css b/addons/web_linkedin/static/src/css/linkedin.css index ecf0d2085b6..b04293a3edd 100644 --- a/addons/web_linkedin/static/src/css/linkedin.css +++ b/addons/web_linkedin/static/src/css/linkedin.css @@ -9,4 +9,20 @@ .openerp .oe_linkedin_input { margin-right:1.5em; +} + +.openerp .oe_linkedin_people { + text-align: center; + cursor: pointer; +} + +.openerp .oe_linkedin_people .oe_linkedin_thumb { + width: 70px; + height: 70px; + text-align: center; +} + +.openerp .oe_linkedin_people img { + max-width: 70px; + max-height: 70px; } \ No newline at end of file diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index 3ccbfce19b9..2b8c047d26e 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -60,7 +60,6 @@ openerp.web_linkedin = function(instance) { instance.web_linkedin.Linkedin = instance.web.form.FieldChar.extend({ init: function() { this._super.apply(this, arguments); - var self = this; this.display_dm = new instance.web.DropMisordered(true); }, initialize_content: function() { @@ -75,9 +74,16 @@ openerp.web_linkedin = function(instance) { search_linkedin: function() { var self = this; this.display_dm.add(instance.web_linkedin.tester.test_linkedin()).then(function() { - new instance.web_linkedin.LinkedinPopup(self, self.get("value")).open(); + var pop = new instance.web_linkedin.LinkedinPopup(self, self.get("value")); + pop.open(); + pop.on("selected", this, function(entity) { + self.selected_entity(entity); + }); }); }, + selected_entity: function(entity) { + debugger; + }, }); instance.web.form.widgets.add('linkedin', 'instance.web_linkedin.Linkedin'); @@ -86,7 +92,7 @@ openerp.web_linkedin = function(instance) { init: function(parent, text) { this._super(parent); this.text = text; - this.limit = 10; + this.limit = 15; }, start: function() { this._super(); @@ -127,7 +133,6 @@ openerp.web_linkedin = function(instance) { }, display_result: function() { var self = this; - self.$element.html("
    "); var i = 0; var $row; _.each(self.result, function(el) { @@ -138,6 +143,10 @@ openerp.web_linkedin = function(instance) { } pc.appendTo($row); pc.$element.css("display", "table-cell"); + pc.$element.css("width", "20%"); + pc.on("selected", self, function(data) { + self.trigger("selected", data); + }); i++; }); }, @@ -150,8 +159,15 @@ openerp.web_linkedin = function(instance) { this.data = data; }, start: function() { + var self = this; + this.$element.click(function() { + self.trigger("selected", self.data); + }); if (this.data.__type === "company") { this.$("h3").text(this.data.name); + IN.API.Raw(_.str.sprintf("companies/%d:(logo-url)", this.data.id)).result(function (result) { + self.$("img").attr("src", result.logoUrl); + }); } else { // people this.$("h3").text(_.str.sprintf("%s %s", this.data.firstName, this.data.lastName)); } diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml index 332ab8a3175..8153901b7d5 100644 --- a/addons/web_linkedin/static/src/xml/linkedin.xml +++ b/addons/web_linkedin/static/src/xml/linkedin.xml @@ -10,12 +10,15 @@
    +
    -
    -

    - +
    + + + +

    \ No newline at end of file -- cgit v1.2.3 From e060a3275f4a6e0a89499b3083e37d847b7d014d Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Fri, 3 Aug 2012 16:41:50 +0200 Subject: Finally got something correct with the thumbnails bzr revid: nicolas.vanhoren@openerp.com-20120803144150-t4b2xvpwwj53khp8 --- addons/web_linkedin/static/src/css/linkedin.css | 15 +++++++++++---- addons/web_linkedin/static/src/js/linkedin.js | 19 ++++++++++++------- addons/web_linkedin/static/src/xml/linkedin.xml | 8 +++++--- 3 files changed, 28 insertions(+), 14 deletions(-) (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/css/linkedin.css b/addons/web_linkedin/static/src/css/linkedin.css index b04293a3edd..16eea9f04d5 100644 --- a/addons/web_linkedin/static/src/css/linkedin.css +++ b/addons/web_linkedin/static/src/css/linkedin.css @@ -11,18 +11,25 @@ margin-right:1.5em; } -.openerp .oe_linkedin_people { +.openerp .oe_linkedin_entity { text-align: center; cursor: pointer; } -.openerp .oe_linkedin_people .oe_linkedin_thumb { - width: 70px; +.openerp .oe_linkedin_entity .oe_linkedin_thumb { + width: 70px; height: 70px; + display: inline-block; text-align: center; } -.openerp .oe_linkedin_people img { +.openerp .oe_linkedin_entity .oe_linkedin_thumb span { + height: 70px; + display: table-cell; + vertical-align: middle; +} + +.openerp .oe_linkedin_entity img { max-width: 70px; max-height: 70px; } \ No newline at end of file diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index 2b8c047d26e..9f3f1c4850a 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -82,7 +82,11 @@ openerp.web_linkedin = function(instance) { }); }, selected_entity: function(entity) { - debugger; + if (entity.__type === "company") { + + } else { //people + + } }, }); instance.web.form.widgets.add('linkedin', 'instance.web_linkedin.Linkedin'); @@ -136,7 +140,7 @@ openerp.web_linkedin = function(instance) { var i = 0; var $row; _.each(self.result, function(el) { - var pc = new instance.web_linkedin.PeopleCompany(self, el); + var pc = new instance.web_linkedin.EntityWidget(self, el); if (i % 5 === 0) { $row = $("
    "); $row.appendTo(self.$(">div")); @@ -152,8 +156,8 @@ openerp.web_linkedin = function(instance) { }, }); - instance.web_linkedin.PeopleCompany = instance.web.Widget.extend({ - template: "PeopleCompany", + instance.web_linkedin.EntityWidget = instance.web.Widget.extend({ + template: "EntityWidget", init: function(parent, data) { this._super(parent); this.data = data; @@ -165,9 +169,10 @@ openerp.web_linkedin = function(instance) { }); if (this.data.__type === "company") { this.$("h3").text(this.data.name); - IN.API.Raw(_.str.sprintf("companies/%d:(logo-url)", this.data.id)).result(function (result) { - self.$("img").attr("src", result.logoUrl); - }); + //IN.API.Raw(_.str.sprintf("companies/%d:(logo-url)", this.data.id)).result(function (result) { + // self.$("img").attr("src", result.logoUrl); + //}); + self.$("img").attr("src", "http://m3.licdn.com/media/p/2/000/03b/36c/283399d.png"); } else { // people this.$("h3").text(_.str.sprintf("%s %s", this.data.firstName, this.data.lastName)); } diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml index 8153901b7d5..6f42d224c66 100644 --- a/addons/web_linkedin/static/src/xml/linkedin.xml +++ b/addons/web_linkedin/static/src/xml/linkedin.xml @@ -13,10 +13,12 @@
    - -
    + +
    - + + +

    -- cgit v1.2.3 From 8b55c937d914c48e5439ddb32958a1b34758ab18 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Fri, 3 Aug 2012 16:43:03 +0200 Subject: Forgot debugging stuff bzr revid: nicolas.vanhoren@openerp.com-20120803144303-rqw9rn0wy1u3kyvo --- addons/web_linkedin/static/src/js/linkedin.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index 9f3f1c4850a..af78c17992a 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -169,10 +169,9 @@ openerp.web_linkedin = function(instance) { }); if (this.data.__type === "company") { this.$("h3").text(this.data.name); - //IN.API.Raw(_.str.sprintf("companies/%d:(logo-url)", this.data.id)).result(function (result) { - // self.$("img").attr("src", result.logoUrl); - //}); - self.$("img").attr("src", "http://m3.licdn.com/media/p/2/000/03b/36c/283399d.png"); + IN.API.Raw(_.str.sprintf("companies/%d:(logo-url)", this.data.id)).result(function (result) { + self.$("img").attr("src", result.logoUrl); + }); } else { // people this.$("h3").text(_.str.sprintf("%s %s", this.data.firstName, this.data.lastName)); } -- cgit v1.2.3 From b55ca0fad10a68916e52f5d4ffaee969018173b6 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Sun, 5 Aug 2012 15:54:20 +0200 Subject: Did better images bzr revid: nicolas.vanhoren@openerp.com-20120805135420-ra5m523lpen8n2sk --- .../static/src/img/ghost_profile_60x60_v1.png | Bin 0 -> 349 bytes addons/web_linkedin/static/src/js/linkedin.js | 12 ++++++------ addons/web_linkedin/static/src/xml/linkedin.xml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 addons/web_linkedin/static/src/img/ghost_profile_60x60_v1.png (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/img/ghost_profile_60x60_v1.png b/addons/web_linkedin/static/src/img/ghost_profile_60x60_v1.png new file mode 100644 index 00000000000..6662a87462b Binary files /dev/null and b/addons/web_linkedin/static/src/img/ghost_profile_60x60_v1.png differ diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index af78c17992a..b1e91b05810 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -110,10 +110,11 @@ openerp.web_linkedin = function(instance) { var self = this; cdef = $.Deferred(); pdef = $.Deferred(); - IN.API.Raw(_.str.sprintf("company-search?keywords=%s&count=%d", encodeURI(this.text), this.limit)).result(function (result) { + IN.API.Raw(_.str.sprintf("company-search:(companies:(id,name,logo-url))?keywords=%s&count=%d", encodeURI(this.text), this.limit)).result(function (result) { cdef.resolve(result); }); - IN.API.PeopleSearch().params({"keywords": this.text, "count": this.limit}).result(function(result) { + IN.API.PeopleSearch().fields(["id", "first-name", "last-name","picture-url"]). + params({"keywords": this.text, "count": this.limit}).result(function(result) { pdef.resolve(result); }); return $.when(cdef, pdef).then(function(companies, people) { @@ -129,7 +130,7 @@ openerp.web_linkedin = function(instance) { el.__type = "people"; return el; }); - lst = lst.concat(plst); + lst = plst.concat(lst); console.log("Linkedin search found:", lst.length, lst); self.result = lst; self.display_result(); @@ -169,11 +170,10 @@ openerp.web_linkedin = function(instance) { }); if (this.data.__type === "company") { this.$("h3").text(this.data.name); - IN.API.Raw(_.str.sprintf("companies/%d:(logo-url)", this.data.id)).result(function (result) { - self.$("img").attr("src", result.logoUrl); - }); + self.$("img").attr("src", this.data.logoUrl); } else { // people this.$("h3").text(_.str.sprintf("%s %s", this.data.firstName, this.data.lastName)); + self.$("img").attr("src", this.data.pictureUrl); } }, }); diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml index 6f42d224c66..eb547029877 100644 --- a/addons/web_linkedin/static/src/xml/linkedin.xml +++ b/addons/web_linkedin/static/src/xml/linkedin.xml @@ -17,7 +17,7 @@
    - +

    -- cgit v1.2.3 From d3e2a13c17ce69dc37f7fe58e1d0fc6854e8ff45 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Sun, 5 Aug 2012 16:03:32 +0200 Subject: Corrected small bug bzr revid: nicolas.vanhoren@openerp.com-20120805140332-mfldrt9zx38b68ww --- addons/web_linkedin/static/src/js/linkedin.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index b1e91b05810..013ad888cb9 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -118,14 +118,14 @@ openerp.web_linkedin = function(instance) { pdef.resolve(result); }); return $.when(cdef, pdef).then(function(companies, people) { - var lst = companies.companies.values; - var plst = people.people.values; + var lst = companies.companies.values || []; + var plst = people.people.values || []; lst = _.initial(lst, _.min([self.limit / 2, plst.length])); _.map(lst, function(el) { el.__type = "company"; return el; }); - plst = _.first(people.people.values, self.limit - lst.length) + plst = _.first(plst, self.limit - lst.length) _.map(plst, function(el) { el.__type = "people"; return el; -- cgit v1.2.3 From 873b4913596e8e67ad8a0c7c50be09d89bcb2b6b Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Mon, 6 Aug 2012 12:07:30 +0200 Subject: wip bzr revid: nicolas.vanhoren@openerp.com-20120806100730-jnsx4mx6o9ykdz2y --- addons/web_linkedin/static/src/js/linkedin.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index 013ad888cb9..cd9a8882497 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -82,19 +82,22 @@ openerp.web_linkedin = function(instance) { }); }, selected_entity: function(entity) { + var to_change = {}; if (entity.__type === "company") { - + to_change.name = entity.name; } else { //people - + to_change.name = _.str.sprintf("%s %s", entity.firstName, entity.lastName); } + this.view.on_processed_onchange({value:to_change}); }, }); + instance.web.form.widgets.add('linkedin', 'instance.web_linkedin.Linkedin'); instance.web_linkedin.LinkedinPopup = instance.web.Dialog.extend({ template: "Linkedin.popup", init: function(parent, text) { - this._super(parent); + this._super(parent, {title:_t("LinkedIn search")}); this.text = text; this.limit = 15; }, @@ -151,6 +154,7 @@ openerp.web_linkedin = function(instance) { pc.$element.css("width", "20%"); pc.on("selected", self, function(data) { self.trigger("selected", data); + self.destroy(); }); i++; }); -- cgit v1.2.3 From 00cbc1d84f59d9ea3203df29177c1f95d850c827 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Mon, 6 Aug 2012 16:09:25 +0200 Subject: Added loading of images bzr revid: nicolas.vanhoren@openerp.com-20120806140925-2i8o7wla0tfgfdsj --- addons/web_linkedin/static/src/js/linkedin.js | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index cd9a8882497..9ddbff78fa6 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -82,13 +82,29 @@ openerp.web_linkedin = function(instance) { }); }, selected_entity: function(entity) { + var self = this; var to_change = {}; + var defs = []; if (entity.__type === "company") { to_change.name = entity.name; + if (entity.logoUrl) { + defs.push(self.rpc('/web_linkedin/binary/url2binary', + {'url': entity.logoUrl}).pipe(function(data){ + to_change.photo = data; + })); + } } else { //people to_change.name = _.str.sprintf("%s %s", entity.firstName, entity.lastName); + if (entity.pictureUrl) { + defs.push(self.rpc('/web_linkedin/binary/url2binary', + {'url': entity.pictureUrl}).pipe(function(data){ + to_change.photo = data; + })); + } } - this.view.on_processed_onchange({value:to_change}); + $.when.apply($, defs).then(function() { + self.view.on_processed_onchange({value:to_change}); + }); }, }); -- cgit v1.2.3 From 2662110aaa6f856a147c048833e44a5bda746244 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Mon, 6 Aug 2012 16:19:38 +0200 Subject: Began profile url bzr revid: nicolas.vanhoren@openerp.com-20120806141938-lbbv9e0eqfvlijvz --- addons/web_linkedin/static/src/js/linkedin.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index 9ddbff78fa6..77296943177 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -93,7 +93,10 @@ openerp.web_linkedin = function(instance) { to_change.photo = data; })); } - } else { //people + /* + to_change.linkedinUrl = _.str.sprintf("http://www.linkedin.com/company/%d", entity.id); + */ + } else { // people to_change.name = _.str.sprintf("%s %s", entity.firstName, entity.lastName); if (entity.pictureUrl) { defs.push(self.rpc('/web_linkedin/binary/url2binary', @@ -101,6 +104,9 @@ openerp.web_linkedin = function(instance) { to_change.photo = data; })); } + /* + to_change.linkedinUrl = entity.publicProfileUrl; + */ } $.when.apply($, defs).then(function() { self.view.on_processed_onchange({value:to_change}); @@ -132,7 +138,7 @@ openerp.web_linkedin = function(instance) { IN.API.Raw(_.str.sprintf("company-search:(companies:(id,name,logo-url))?keywords=%s&count=%d", encodeURI(this.text), this.limit)).result(function (result) { cdef.resolve(result); }); - IN.API.PeopleSearch().fields(["id", "first-name", "last-name","picture-url"]). + IN.API.PeopleSearch().fields(["id", "first-name", "last-name", "picture-url", "public-profile-url"]). params({"keywords": this.text, "count": this.limit}).result(function(result) { pdef.resolve(result); }); -- cgit v1.2.3 From dfc114f6decd70ea29a9cc1d50b5cbb4f9af9d8d Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Mon, 6 Aug 2012 16:33:43 +0200 Subject: Small correction in image bzr revid: nicolas.vanhoren@openerp.com-20120806143343-oowyy3apn489cl07 --- .../static/src/img/ghost_profile_60x60_v1.png | Bin 349 -> 453 bytes addons/web_linkedin/static/src/js/linkedin.js | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/img/ghost_profile_60x60_v1.png b/addons/web_linkedin/static/src/img/ghost_profile_60x60_v1.png index 6662a87462b..c132fc829b2 100644 Binary files a/addons/web_linkedin/static/src/img/ghost_profile_60x60_v1.png and b/addons/web_linkedin/static/src/img/ghost_profile_60x60_v1.png differ diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index 77296943177..3b2285215cb 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -93,7 +93,7 @@ openerp.web_linkedin = function(instance) { to_change.photo = data; })); } - /* + /* TODO to_change.linkedinUrl = _.str.sprintf("http://www.linkedin.com/company/%d", entity.id); */ } else { // people @@ -104,7 +104,7 @@ openerp.web_linkedin = function(instance) { to_change.photo = data; })); } - /* + /* TODO to_change.linkedinUrl = entity.publicProfileUrl; */ } -- cgit v1.2.3 From 98ab0c6ebb0856a4a5d246304c4b9673743fce2c Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Mon, 6 Aug 2012 16:54:35 +0200 Subject: Added some mappings for people bzr revid: nicolas.vanhoren@openerp.com-20120806145435-isbyu9fefja0w4lv --- addons/web_linkedin/static/src/js/linkedin.js | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index 3b2285215cb..4743c7654d3 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -86,6 +86,7 @@ openerp.web_linkedin = function(instance) { var to_change = {}; var defs = []; if (entity.__type === "company") { + to_change.is_company = true; to_change.name = entity.name; if (entity.logoUrl) { defs.push(self.rpc('/web_linkedin/binary/url2binary', @@ -97,13 +98,26 @@ openerp.web_linkedin = function(instance) { to_change.linkedinUrl = _.str.sprintf("http://www.linkedin.com/company/%d", entity.id); */ } else { // people - to_change.name = _.str.sprintf("%s %s", entity.firstName, entity.lastName); + to_change.is_company = false; + to_change.name = entity.formattedName; if (entity.pictureUrl) { defs.push(self.rpc('/web_linkedin/binary/url2binary', {'url': entity.pictureUrl}).pipe(function(data){ to_change.photo = data; })); + } else { + to_change.photo = false; } + to_change.mobile = false; + to_change.phone = false; + _.each(entity.phoneNumbers.values || [], function(el) { + if (el.phoneType === "mobile") { + to_change.mobile = el.phoneNumber; + } else { + to_change.phone = el.phoneNumber; + } + }); + to_change.function = entity.headline; /* TODO to_change.linkedinUrl = entity.publicProfileUrl; */ @@ -135,10 +149,14 @@ openerp.web_linkedin = function(instance) { var self = this; cdef = $.Deferred(); pdef = $.Deferred(); - IN.API.Raw(_.str.sprintf("company-search:(companies:(id,name,logo-url))?keywords=%s&count=%d", encodeURI(this.text), this.limit)).result(function (result) { + IN.API.Raw(_.str.sprintf( + "company-search:(companies:(id,name,logo-url))?keywords=%s&count=%d", + encodeURI(this.text), this.limit)).result(function (result) { cdef.resolve(result); }); - IN.API.PeopleSearch().fields(["id", "first-name", "last-name", "picture-url", "public-profile-url"]). + IN.API.PeopleSearch().fields(["id", "picture-url", "public-profile-url", + "formatted-name", "location", "phone-numbers", "im-accounts", + "main-address", "headline"]). params({"keywords": this.text, "count": this.limit}).result(function(result) { pdef.resolve(result); }); @@ -198,7 +216,7 @@ openerp.web_linkedin = function(instance) { this.$("h3").text(this.data.name); self.$("img").attr("src", this.data.logoUrl); } else { // people - this.$("h3").text(_.str.sprintf("%s %s", this.data.firstName, this.data.lastName)); + this.$("h3").text(this.data.formattedName); self.$("img").attr("src", this.data.pictureUrl); } }, -- cgit v1.2.3 From 8978f47ebbb5e1263529c803c8d8ba7909df2da9 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Mon, 6 Aug 2012 17:03:04 +0200 Subject: Mapped some fields for companies bzr revid: nicolas.vanhoren@openerp.com-20120806150304-b4s4vouwzzpokeah --- addons/web_linkedin/static/src/js/linkedin.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index 4743c7654d3..2145bbd6dd5 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -88,25 +88,30 @@ openerp.web_linkedin = function(instance) { if (entity.__type === "company") { to_change.is_company = true; to_change.name = entity.name; + to_change.photo = false; if (entity.logoUrl) { defs.push(self.rpc('/web_linkedin/binary/url2binary', {'url': entity.logoUrl}).pipe(function(data){ to_change.photo = data; })); } + to_change.website = entity.websiteUrl; + to_change.phone = false; + _.each(entity.locations.values || [], function(el) { + to_change.phone = el.contactInfo.phone1; + }); /* TODO to_change.linkedinUrl = _.str.sprintf("http://www.linkedin.com/company/%d", entity.id); */ } else { // people to_change.is_company = false; to_change.name = entity.formattedName; + to_change.photo = false; if (entity.pictureUrl) { defs.push(self.rpc('/web_linkedin/binary/url2binary', {'url': entity.pictureUrl}).pipe(function(data){ to_change.photo = data; })); - } else { - to_change.photo = false; } to_change.mobile = false; to_change.phone = false; @@ -150,7 +155,8 @@ openerp.web_linkedin = function(instance) { cdef = $.Deferred(); pdef = $.Deferred(); IN.API.Raw(_.str.sprintf( - "company-search:(companies:(id,name,logo-url))?keywords=%s&count=%d", + "company-search:(companies:" + + "(id,name,logo-url,description,industry,website-url,locations))?keywords=%s&count=%d", encodeURI(this.text), this.limit)).result(function (result) { cdef.resolve(result); }); -- cgit v1.2.3 From 91191932b64bd6b36c925a9f0ef3b2990cf31a10 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Mon, 6 Aug 2012 17:28:09 +0200 Subject: Added loading of company members bzr revid: nicolas.vanhoren@openerp.com-20120806152809-ciug91i6z1gn8qsn --- addons/web_linkedin/static/src/js/linkedin.js | 36 +++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 5 deletions(-) (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index 2145bbd6dd5..8f691d920df 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -82,6 +82,12 @@ openerp.web_linkedin = function(instance) { }); }, selected_entity: function(entity) { + var self = this; + this.create_on_change(entity).then(function(to_change) { + self.view.on_processed_onchange({value:to_change}); + }); + }, + create_on_change: function(entity) { var self = this; var to_change = {}; var defs = []; @@ -100,6 +106,24 @@ openerp.web_linkedin = function(instance) { _.each(entity.locations.values || [], function(el) { to_change.phone = el.contactInfo.phone1; }); + var children_def = $.Deferred(); + IN.API.PeopleSearch().fields(commonPeopleFields).params({ + "company-name" : entity.name, + "current-company": true, + "count": 25, + }).result(function(result) { + children_def.resolve(result); + }); + defs.push(children_def.pipe(function(result) { + var defs = _.map(result.people.values || [], function(el) { + el.__type = "people"; + return self.create_on_change(el); + }); + return $.when.apply($, defs).pipe(function() { + var p_to_change = _.toArray(arguments); + to_change.child_ids = p_to_change; + }); + })); /* TODO to_change.linkedinUrl = _.str.sprintf("http://www.linkedin.com/company/%d", entity.id); */ @@ -127,14 +151,18 @@ openerp.web_linkedin = function(instance) { to_change.linkedinUrl = entity.publicProfileUrl; */ } - $.when.apply($, defs).then(function() { - self.view.on_processed_onchange({value:to_change}); + return $.when.apply($, defs).pipe(function() { + return to_change; }); }, }); instance.web.form.widgets.add('linkedin', 'instance.web_linkedin.Linkedin'); + var commonPeopleFields = ["id", "picture-url", "public-profile-url", + "formatted-name", "location", "phone-numbers", "im-accounts", + "main-address", "headline"]; + instance.web_linkedin.LinkedinPopup = instance.web.Dialog.extend({ template: "Linkedin.popup", init: function(parent, text) { @@ -160,9 +188,7 @@ openerp.web_linkedin = function(instance) { encodeURI(this.text), this.limit)).result(function (result) { cdef.resolve(result); }); - IN.API.PeopleSearch().fields(["id", "picture-url", "public-profile-url", - "formatted-name", "location", "phone-numbers", "im-accounts", - "main-address", "headline"]). + IN.API.PeopleSearch().fields(commonPeopleFields). params({"keywords": this.text, "count": this.limit}).result(function(result) { pdef.resolve(result); }); -- cgit v1.2.3 From e02cd8025f5449032f7eb89e94fe2f88886db788 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Tue, 7 Aug 2012 11:02:38 +0200 Subject: Small detail bzr revid: nicolas.vanhoren@openerp.com-20120807090238-ex80nxzrpt4gfb3g --- addons/web_linkedin/static/src/js/linkedin.js | 3 +++ 1 file changed, 3 insertions(+) (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index 8f691d920df..8801b0c8164 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -230,6 +230,9 @@ openerp.web_linkedin = function(instance) { }); i++; }); + if (self.result.length === 0) { + self.$(">div").text(_t("No results found")); + } }, }); -- cgit v1.2.3 From ab05e368c5dac1974bcc73473bafafddcefa3c37 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Tue, 7 Aug 2012 17:34:35 +0200 Subject: Added begin of api key wizard bzr revid: nicolas.vanhoren@openerp.com-20120807153435-vshesd2cubjty0o6 --- addons/web_linkedin/static/src/js/linkedin.js | 28 +++++++++++++++++++++---- addons/web_linkedin/static/src/xml/linkedin.xml | 13 +++++++++++- 2 files changed, 36 insertions(+), 5 deletions(-) (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index 8801b0c8164..8e196434992 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -8,7 +8,6 @@ openerp.web_linkedin = function(instance) { instance.web_linkedin.LinkedinTester = instance.web.Class.extend({ init: function() { - this.api_key = "cxnr0l53n73x"; this.linkedin_added = false; this.linkedin_def = $.Deferred(); this.auth_def = $.Deferred(); @@ -34,11 +33,12 @@ openerp.web_linkedin = function(instance) { }); }, test_api_key: function() { + var self = this; if (this.api_key) { return $.when(); } return new instance.web.Model("ir.config_parameter").call("get_param", ["web.linkedin.apikey"]).pipe(function(a) { - if (a !== false) { + if (!!a) { self.api_key = a; return true; } else { @@ -79,7 +79,19 @@ openerp.web_linkedin = function(instance) { pop.on("selected", this, function(entity) { self.selected_entity(entity); }); - }); + }, _.bind(this.linkedin_disabled, this)); + }, + linkedin_disabled: function() { + if (instance.connection.uid !== 1) { + instance.web.dialog($(QWeb.render("LinkedIn.DisabledWarning")), { + title: _t("LinkedIn is not enabled"), + buttons: [ + {text: _t("Ok"), click: function() { $(this).dialog("close"); }} + ] + }); + } else { + new instance.web_linkedin.KeyWizard(this).open(); + } }, selected_entity: function(entity) { var self = this; @@ -237,7 +249,7 @@ openerp.web_linkedin = function(instance) { }); instance.web_linkedin.EntityWidget = instance.web.Widget.extend({ - template: "EntityWidget", + template: "Linkedin.EntityWidget", init: function(parent, data) { this._super(parent); this.data = data; @@ -256,5 +268,13 @@ openerp.web_linkedin = function(instance) { } }, }); + + + instance.web_linkedin.KeyWizard = instance.web.Dialog.extend({ + template: "LinkedIn.KeyWizard", + init: function(parent, text) { + this._super(parent, {title:_t("LinkedIn API Key")}); + }, + }); }; // vim:et fdc=0 fdl=0: diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml index eb547029877..3fa5509adfe 100644 --- a/addons/web_linkedin/static/src/xml/linkedin.xml +++ b/addons/web_linkedin/static/src/xml/linkedin.xml @@ -13,7 +13,7 @@
    - +
    @@ -23,4 +23,15 @@

    + +
    + LinkedIn access was not enabled on this server. + Please ask your administrator to activate it. +
    +     + +
    + Yoh! +
    +     \ No newline at end of file -- cgit v1.2.3 From c2ed48a942dba9510405372ae558bc832e08b0ac Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Wed, 8 Aug 2012 10:38:59 +0200 Subject: Added wizard to fill api key bzr revid: nicolas.vanhoren@openerp.com-20120808083859-p81dah14fy9r0rrx --- addons/web_linkedin/static/src/js/linkedin.js | 15 +++++++++++---- addons/web_linkedin/static/src/xml/linkedin.xml | 23 ++++++++++++++++++++++- 2 files changed, 33 insertions(+), 5 deletions(-) (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index 8e196434992..e199ae90841 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -51,10 +51,6 @@ openerp.web_linkedin = function(instance) { }, }); - /*return new instance.web.Model("ir.config_parameter").call("set_param", ["web.linkedin.apikey", "cxnr0l53n73x"]).pipe(function() { - return self.test_linkedin(); - });*/ - instance.web_linkedin.tester = new instance.web_linkedin.LinkedinTester(); instance.web_linkedin.Linkedin = instance.web.form.FieldChar.extend({ @@ -275,6 +271,17 @@ openerp.web_linkedin = function(instance) { init: function(parent, text) { this._super(parent, {title:_t("LinkedIn API Key")}); }, + start: function() { + this._super(); + var self = this; + this.$("button").click(function() { + var value = self.$("input").val(); + debugger; + return new instance.web.Model("ir.config_parameter").call("set_param", ["web.linkedin.apikey", value]).pipe(function() { + self.destroy(); + }); + }); + }, }); }; // vim:et fdc=0 fdl=0: diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml index 3fa5509adfe..fbd95cb1e08 100644 --- a/addons/web_linkedin/static/src/xml/linkedin.xml +++ b/addons/web_linkedin/static/src/xml/linkedin.xml @@ -31,7 +31,28 @@
    - Yoh! +

    + Connect OpenERP with LinkedIn to synchronize partners and customers with LinkedIn contacts and + get their data automatically (photos, address, news). You just need to setup the API key once, and it will work + for all users of your system. +

    +
      +
    • Go to this URL: + https://www.linkedin.com/secure/developer. +
      • +
    • Log into LinkedIn.
      • +
    • Add New Application and fill the form, +
        +
      • JavaScript API Domain is Your domain name (e.g. https://yourcompany.my.openerp.com)
        • +
      • You can give multiple domain (e.g. yourcompany.my.openerp.com)
        • +
      • programming tools is Javascript
        • +
      +
      • +
    • Copy the API key here: + + +
      • +
    \ No newline at end of file -- cgit v1.2.3 From 57d6f66e1ccf4478cc77089e1f99f82d8ce855ea Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Wed, 8 Aug 2012 11:30:48 +0200 Subject: Typo bzr revid: nicolas.vanhoren@openerp.com-20120808093048-pxi6nwne1dkat5p7 --- addons/web_linkedin/static/src/xml/linkedin.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml index fbd95cb1e08..c6a724f7127 100644 --- a/addons/web_linkedin/static/src/xml/linkedin.xml +++ b/addons/web_linkedin/static/src/xml/linkedin.xml @@ -41,11 +41,11 @@ https://www.linkedin.com/secure/developer.
  • Log into LinkedIn.
    • -
  • Add New Application and fill the form, +
  • Add a new application and fill the form,
    • JavaScript API Domain is Your domain name (e.g. https://yourcompany.my.openerp.com)
    • You can give multiple domain (e.g. yourcompany.my.openerp.com)
      • -
    • programming tools is Javascript
      • +
    • The programming tool is Javascript
  • Copy the API key here: -- cgit v1.2.3 From ea2614ebfd4598ba72721f68703b7ad0b803d707 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Wed, 8 Aug 2012 12:39:59 +0200 Subject: wip bzr revid: nicolas.vanhoren@openerp.com-20120808103959-4yc27emn5i7vgh68 --- addons/web_linkedin/static/src/js/linkedin.js | 3 ++- addons/web_linkedin/static/src/xml/linkedin.xml | 6 ++---- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index e199ae90841..67b003b93c3 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -37,6 +37,7 @@ openerp.web_linkedin = function(instance) { if (this.api_key) { return $.when(); } + return new instance.web.Model("ir.config_parameter").call("set_param", ["web.linkedin.apikey", ""]).pipe(function() { return new instance.web.Model("ir.config_parameter").call("get_param", ["web.linkedin.apikey"]).pipe(function(a) { if (!!a) { self.api_key = a; @@ -45,6 +46,7 @@ openerp.web_linkedin = function(instance) { return $.Deferred().reject(); } }); + }); }, test_authentication: function() { return this.auth_def.promise(); @@ -276,7 +278,6 @@ openerp.web_linkedin = function(instance) { var self = this; this.$("button").click(function() { var value = self.$("input").val(); - debugger; return new instance.web.Model("ir.config_parameter").call("set_param", ["web.linkedin.apikey", value]).pipe(function() { self.destroy(); }); diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml index c6a724f7127..0d062e6fd8c 100644 --- a/addons/web_linkedin/static/src/xml/linkedin.xml +++ b/addons/web_linkedin/static/src/xml/linkedin.xml @@ -32,16 +32,14 @@

    - Connect OpenERP with LinkedIn to synchronize partners and customers with LinkedIn contacts and - get their data automatically (photos, address, news). You just need to setup the API key once, and it will work - for all users of your system. + To use the LinkedIn module with this database, an API Key is required. Please follow this procedure:

    • Go to this URL: https://www.linkedin.com/secure/developer.
    • Log into LinkedIn.
      • -
    • Add a new application and fill the form, +
    • Add a new application and fill the form:
      • JavaScript API Domain is Your domain name (e.g. https://yourcompany.my.openerp.com)
      • You can give multiple domain (e.g. yourcompany.my.openerp.com)
        • -- cgit v1.2.3 From f63d7594493313177e7ca34099dc5a6f6326dd46 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Wed, 8 Aug 2012 14:54:16 +0200 Subject: To force fucking runbot to reload bzr revid: nicolas.vanhoren@openerp.com-20120808125416-l8pulou1fi6nbdpn --- addons/web_linkedin/static/src/js/linkedin.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index 67b003b93c3..d08aa3ede28 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -269,7 +269,7 @@ openerp.web_linkedin = function(instance) { instance.web_linkedin.KeyWizard = instance.web.Dialog.extend({ - template: "LinkedIn.KeyWizard", + template: "LinkedIn.KeyWizard", init: function(parent, text) { this._super(parent, {title:_t("LinkedIn API Key")}); }, -- cgit v1.2.3 From 410becf8db33bcbb8a37018766f84715ee013921 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Thu, 9 Aug 2012 11:44:25 +0200 Subject: [FIX] forgot testing code in web linkedin bzr revid: nicolas.vanhoren@openerp.com-20120809094425-jgner67ra7rlqyw7 --- addons/web_linkedin/static/src/js/linkedin.js | 2 -- 1 file changed, 2 deletions(-) (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index d08aa3ede28..977e7a60cbb 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -37,7 +37,6 @@ openerp.web_linkedin = function(instance) { if (this.api_key) { return $.when(); } - return new instance.web.Model("ir.config_parameter").call("set_param", ["web.linkedin.apikey", ""]).pipe(function() { return new instance.web.Model("ir.config_parameter").call("get_param", ["web.linkedin.apikey"]).pipe(function(a) { if (!!a) { self.api_key = a; @@ -46,7 +45,6 @@ openerp.web_linkedin = function(instance) { return $.Deferred().reject(); } }); - }); }, test_authentication: function() { return this.auth_def.promise(); -- cgit v1.2.3