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

[FIX] {web,point_of_sale}: allow cross-origin access to company logo

This commit is contained in:
Christophe Simonis 2014-10-20 20:14:36 +02:00
parent 6feb5f70e9
commit edc4b0b9bb
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/point_of_sale/static/src/js/models.js
View File

@ -276,18 +276,19 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
c.height = height
var ctx = c.getContext('2d');
ctx.drawImage(self.company_logo,0,0, width, height);
self.company_logo_base64 = c.toDataURL();
logo_loaded.resolve();
};
self.company_logo.onerror = function(){
logo_loaded.reject();
};
self.company_logo.crossOrigin = "anonymous";
self.company_logo.src = '/web/binary/company_logo'+'?_'+Math.random();
return logo_loaded;
});
return loaded;
},

2
addons/web/controllers/main.py
View File

@ -1471,7 +1471,7 @@ class Binary(http.Controller):
'/web/binary/company_logo',
'/logo',
'/logo.png',
], type='http', auth="none")
], type='http', auth="none", cors="*")
def company_logo(self, dbname=None, **kw):
# TODO add etag, refactor to use /image code for etag
uid = None