From f257cb34524e0f230e41b7229bbcd71ad50974d5 Mon Sep 17 00:00:00 2001 From: "Jiten (OpenERP)" Date: Tue, 19 Jun 2012 18:45:18 +0530 Subject: [PATCH] [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 +++--- addons/web_linkedin/web_linkedin.py | 20 ++++++++++++------- 2 files changed, 16 insertions(+), 10 deletions(-) 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 ) { diff --git a/addons/web_linkedin/web_linkedin.py b/addons/web_linkedin/web_linkedin.py index eb74dd95da7..ce0fc30eaec 100644 --- a/addons/web_linkedin/web_linkedin.py +++ b/addons/web_linkedin/web_linkedin.py @@ -37,6 +37,19 @@ class company(osv.osv): company() +class users(osv.osv): + _inherit = 'res.users' + + def set_linkedin_api_key(self, cr, uid, key, context=None): + company_obj = self.pool.get('res.company') + company_id = company_obj._company_default_get(cr, uid, 'res.users', context=context) + company_obj.write(cr, uid, [company_id], {'default_linkedin_api_key': key }) + ir_values = self.pool.get('ir.values') + ir_values.set_default(cr, uid, 'res.company', 'linkedin_api_key', key) + + return True +users() + class res_partner(osv.osv): _inherit = 'res.partner' @@ -70,11 +83,4 @@ class Binary(openerpweb.Controller): bfile = urllib2.urlopen(url) return base64.b64encode(bfile.read()) -class WebClient(openerpweb.Controller): - _cp_path = "/web_linkedin/webclient" - - @openerpweb.jsonrequest - def api_key(self, req, key): - - return False # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: