From a7a73ee0c0efa56144f2d6c9572b06079d2d3a92 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 12 Oct 2011 11:00:38 +0200 Subject: [FIX] don't hide errors under the carpet bzr revid: xmo@openerp.com-20111012090038-o52egjn334s53a1s --- addons/web_dashboard/controllers.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'addons/web_dashboard/controllers.py') diff --git a/addons/web_dashboard/controllers.py b/addons/web_dashboard/controllers.py index ebf74837899..37fe039366c 100644 --- a/addons/web_dashboard/controllers.py +++ b/addons/web_dashboard/controllers.py @@ -22,11 +22,7 @@ class Widgets(openerpweb.Controller): _cp_path = '/web_dashboard/widgets' @openerpweb.httprequest - def content(self, req, widget_id): - Widget = req.session.model('res.widget') - w = Widget.read([widget_id], ['content'], req.session.eval_context(req.context)) - if w: - r = WIDGET_CONTENT_PATTERN % w[0] - else: - r = "Widget unavailable" - return r + def content(self, request, widget_id): + return WIDGET_CONTENT_PATTERN % request.session.model('res.widget').read( + [widget_id], ['content'], request.session.eval_context(request.context) + )[0] -- cgit v1.2.3 From 8b00901409337144b339b32c6a3209ab7e452ac3 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 12 Oct 2011 11:03:35 +0200 Subject: [FIX] widgets not being correctly fetched: widget ids are integers, HTTP GET provides strings, need to convert bzr revid: xmo@openerp.com-20111012090335-f2ljdgmhmz7pyurg --- addons/web_dashboard/controllers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/web_dashboard/controllers.py') diff --git a/addons/web_dashboard/controllers.py b/addons/web_dashboard/controllers.py index 37fe039366c..0f6ae5dad7d 100644 --- a/addons/web_dashboard/controllers.py +++ b/addons/web_dashboard/controllers.py @@ -24,5 +24,5 @@ class Widgets(openerpweb.Controller): @openerpweb.httprequest def content(self, request, widget_id): return WIDGET_CONTENT_PATTERN % request.session.model('res.widget').read( - [widget_id], ['content'], request.session.eval_context(request.context) + [int(widget_id)], ['content'], request.session.eval_context(request.context) )[0] -- cgit v1.2.3