From d96d8f4542f0cebcbfaad0051275c0baaf43d0c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Todorovich?= Date: Thu, 18 Aug 2016 12:29:58 -0300 Subject: [PATCH] Fixes --- web_dashboard_tile/README.rst | 2 ++ web_dashboard_tile/models/tile_tile.py | 9 ++++----- web_dashboard_tile/static/src/css/tile.css | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/web_dashboard_tile/README.rst b/web_dashboard_tile/README.rst index 8aa70f02..b6ee2989 100644 --- a/web_dashboard_tile/README.rst +++ b/web_dashboard_tile/README.rst @@ -34,6 +34,7 @@ possible future improvments =========================== * add icons; * support client side action (like inbox); +* restore original Domain + Filter when an action is set. Bug Tracker =========== @@ -52,6 +53,7 @@ Contributors * Markus Schneider * Sylvain Le Gal (https://twitter.com/legalsylvain) +* Iván Todorovich Maintainer ---------- diff --git a/web_dashboard_tile/models/tile_tile.py b/web_dashboard_tile/models/tile_tile.py index 1a5c617b..7dc72758 100644 --- a/web_dashboard_tile/models/tile_tile.py +++ b/web_dashboard_tile/models/tile_tile.py @@ -35,7 +35,7 @@ class TileTile(models.Model): 'datetime': datetime, 'relativedelta': relativedelta, 'context_today': _context_today, - 'current_date': time.strftime('%Y-%m-%d'), + 'current_date': fields.Date.today(), }) return context @@ -111,13 +111,13 @@ class TileTile(models.Model): def _check_model_id_field_id(self): if self.field_id and self.field_id.model_id.id != self.model_id.id: raise ValidationError( - _("Please select a field of the selected model.")) + _("Please select a field from the selected model.")) @api.one @api.constrains('field_id', 'field_function') def _check_field_id_field_function(self): - if self.field_id and not self.field_function or\ - self.field_function and not self.field_id: + validations = self.field_id, self.field_function + if any(validations) and not all(validations): raise ValidationError( _("Please set both: 'Field' and 'Function'.")) @@ -139,7 +139,6 @@ class TileTile(models.Model): if self.action_id: res.update(self.action_id.read( ['view_type', 'view_mode', 'type'])[0]) - # FIXME: restore original Domain + Filter would be better return res @api.model diff --git a/web_dashboard_tile/static/src/css/tile.css b/web_dashboard_tile/static/src/css/tile.css index 9bfdf0ae..5649c188 100644 --- a/web_dashboard_tile/static/src/css/tile.css +++ b/web_dashboard_tile/static/src/css/tile.css @@ -49,4 +49,4 @@ .openerp .oe_searchview_drawer .oe_opened .oe_dashboard_tile_form { display: block; -} \ No newline at end of file +}