From 2c255db1d0abbb726f4d3430a24bb13225fda591 Mon Sep 17 00:00:00 2001 From: jke-openerp Date: Tue, 28 Jan 2014 15:28:24 +0100 Subject: [PATCH 1/3] [REF] Move public_user from website_data to module server/addons/base [REF] Remove _auth_method_public from website/ir_http to become a native auth_method in server/addons/base/ir/ir_http bzr revid: jke@openerp.com-20140128142824-62ejlnnud4a4m694 --- addons/website/data/website_data.xml | 15 --------------- addons/website/models/ir_http.py | 7 ------- addons/website/static/img/public_user-image.png | Bin 3193 -> 0 bytes 3 files changed, 22 deletions(-) delete mode 100644 addons/website/static/img/public_user-image.png diff --git a/addons/website/data/website_data.xml b/addons/website/data/website_data.xml index a12909337ff..bf4298da273 100644 --- a/addons/website/data/website_data.xml +++ b/addons/website/data/website_data.xml @@ -26,21 +26,6 @@ 60 - - Anonymous - public - public - - - - - - - - - - - Display Editor Bar on Website diff --git a/addons/website/models/ir_http.py b/addons/website/models/ir_http.py index 02e320deeb0..d8a6f5c5fa1 100644 --- a/addons/website/models/ir_http.py +++ b/addons/website/models/ir_http.py @@ -31,13 +31,6 @@ class ir_http(orm.AbstractModel): page=PageConverter, ) - def _auth_method_public(self): - if not request.session.uid: - request.uid = request.registry['website'].get_public_user( - request.cr, openerp.SUPERUSER_ID, request.context) - else: - request.uid = request.session.uid - def _dispatch(self): first_pass = not hasattr(request, 'website') request.website = None diff --git a/addons/website/static/img/public_user-image.png b/addons/website/static/img/public_user-image.png deleted file mode 100644 index e333176e3e483a9dfc6f5da20d015c5e5c634d42..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3193 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 Date: Tue, 28 Jan 2014 15:32:24 +0100 Subject: [PATCH 2/3] [REF] Replace login as anonymous in im_livechat with auth_method_public bzr revid: jke@openerp.com-20140128143224-139yby4apcrvjf54 --- addons/im_livechat/im_livechat.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/im_livechat/im_livechat.py b/addons/im_livechat/im_livechat.py index e322467e64e..ca4a5f3ac20 100644 --- a/addons/im_livechat/im_livechat.py +++ b/addons/im_livechat/im_livechat.py @@ -40,10 +40,10 @@ class LiveChatController(http.Controller): def _auth(self, db): reg = openerp.modules.registry.RegistryManager.get(db) - uid = openerp.netsvc.dispatch_rpc('common', 'authenticate', [db, "anonymous", "anonymous", None]) + uid = request.uid return reg, uid - @http.route('/im_livechat/loader', auth="none") + @http.route('/im_livechat/loader', auth="public") def loader(self, **kwargs): p = json.loads(kwargs["p"]) db = p["db"] @@ -59,7 +59,7 @@ class LiveChatController(http.Controller): return request.make_response(env.get_template("loader.js").render(info), headers=[('Content-Type', "text/javascript")]) - @http.route('/im_livechat/web_page', auth="none") + @http.route('/im_livechat/web_page', auth="public") def web_page(self, **kwargs): p = json.loads(kwargs["p"]) db = p["db"] @@ -72,7 +72,7 @@ class LiveChatController(http.Controller): return request.make_response(env.get_template("web_page.html").render(info), headers=[('Content-Type', "text/html")]) - @http.route('/im_livechat/available', type='json', auth="none") + @http.route('/im_livechat/available', type='json', auth="public") def available(self, db, channel): reg, uid = self._auth(db) with reg.cursor() as cr: From 0fc5b4680b69a55bbd5f7e1e1ab2088e277a1791 Mon Sep 17 00:00:00 2001 From: jke-openerp Date: Tue, 28 Jan 2014 15:36:17 +0100 Subject: [PATCH 3/3] [REF] Set public_user as a shared user in data when we installs the module share bzr revid: jke@openerp.com-20140128143617-02bfjb27hgmucu4e --- addons/share/__openerp__.py | 3 ++- addons/share/share_data.xml | 9 +++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 addons/share/share_data.xml diff --git a/addons/share/__openerp__.py b/addons/share/__openerp__.py index 607dde3aa71..8013622ca1d 100644 --- a/addons/share/__openerp__.py +++ b/addons/share/__openerp__.py @@ -46,7 +46,8 @@ synchronization with other companies. 'data': [ 'security/share_security.xml', 'res_users_view.xml', - 'wizard/share_wizard_view.xml' + 'wizard/share_wizard_view.xml', + 'share_demo.xml', ], 'installable': True, 'auto_install': True, diff --git a/addons/share/share_data.xml b/addons/share/share_data.xml new file mode 100644 index 00000000000..aba154a6403 --- /dev/null +++ b/addons/share/share_data.xml @@ -0,0 +1,9 @@ + + + + + + + + +