Techsystech
/
web
mirror of https://github.com/OCA/web.git
3
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Fixes

pull/405/head
Iván Todorovich 2016-08-18 12:29:58 -03:00
parent 757a1812b5
commit d96d8f4542
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web_dashboard_tile/README.rst
View File

@ -34,6 +34,7 @@ possible future improvments
=========================== ===========================
* add icons; * add icons;
* support client side action (like inbox); * support client side action (like inbox);
* restore original Domain + Filter when an action is set.
Bug Tracker Bug Tracker
=========== ===========
@ -52,6 +53,7 @@ Contributors
* Markus Schneider <markus.schneider at initos.com> * Markus Schneider <markus.schneider at initos.com>
* Sylvain Le Gal (https://twitter.com/legalsylvain) * Sylvain Le Gal (https://twitter.com/legalsylvain)
* Iván Todorovich <ivan.todorovich@gmail.com>
Maintainer Maintainer
---------- ----------

9
web_dashboard_tile/models/tile_tile.py
View File

@ -35,7 +35,7 @@ class TileTile(models.Model):
'datetime': datetime, 'datetime': datetime,
'relativedelta': relativedelta, 'relativedelta': relativedelta,
'context_today': _context_today, 'context_today': _context_today,
'current_date': time.strftime('%Y-%m-%d'), 'current_date': fields.Date.today(),
}) })
return context return context
@ -111,13 +111,13 @@ class TileTile(models.Model):
def _check_model_id_field_id(self): def _check_model_id_field_id(self):
if self.field_id and self.field_id.model_id.id != self.model_id.id: if self.field_id and self.field_id.model_id.id != self.model_id.id:
raise ValidationError( raise ValidationError(
_("Please select a field of the selected model.")) _("Please select a field from the selected model."))
@api.one @api.one
@api.constrains('field_id', 'field_function') @api.constrains('field_id', 'field_function')
def _check_field_id_field_function(self): def _check_field_id_field_function(self):
if self.field_id and not self.field_function or\ validations = self.field_id, self.field_function
self.field_function and not self.field_id: if any(validations) and not all(validations):
raise ValidationError( raise ValidationError(
_("Please set both: 'Field' and 'Function'.")) _("Please set both: 'Field' and 'Function'."))
@ -139,7 +139,6 @@ class TileTile(models.Model):
if self.action_id: if self.action_id:
res.update(self.action_id.read( res.update(self.action_id.read(
['view_type', 'view_mode', 'type'])[0]) ['view_type', 'view_mode', 'type'])[0])
# FIXME: restore original Domain + Filter would be better
return res return res
@api.model @api.model

2
web_dashboard_tile/static/src/css/tile.css
View File

@ -49,4 +49,4 @@
.openerp .oe_searchview_drawer .oe_opened .oe_dashboard_tile_form { .openerp .oe_searchview_drawer .oe_opened .oe_dashboard_tile_form {
display: block; display: block;
} }