diff options
| author | RomainLibert <rli@odoo.com> | 2019-10-09 10:06:14 +0000 |
|---|---|---|
| committer | fw-bot <otis@odoo.com> | 2019-10-16 16:39:16 +0000 |
| commit | d4fb89cd25063be86f0f8ea56d4b9cdabb2ae43a (patch) | |
| tree | 3f7bbeb77f3a0cdc1e5e7198fc76e5f43c2496de /addons | |
| parent | 3daec8b5fb5738dc07b0ca3a53aa1c3de7833733 (diff) | |
[IMP] lunch: back2basics
closes odoo/odoo#38899
X-original-commit: f4dbee9b844015e95afd5edf892489582cf1f397
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/lunch/models/lunch_alert.py | 14 | ||||
| -rw-r--r-- | addons/lunch/static/src/scss/lunch_kanban.scss | 6 | ||||
| -rw-r--r-- | addons/lunch/static/src/xml/lunch_kanban.xml | 10 | ||||
| -rw-r--r-- | addons/lunch/views/lunch_alert_views.xml | 2 |
4 files changed, 18 insertions, 14 deletions
diff --git a/addons/lunch/models/lunch_alert.py b/addons/lunch/models/lunch_alert.py index fb8b7b4b369..45795f1e662 100644 --- a/addons/lunch/models/lunch_alert.py +++ b/addons/lunch/models/lunch_alert.py @@ -37,13 +37,13 @@ class LunchAlert(models.Model): tz = fields.Selection(_tz_get, string='Timezone', required=True, default=lambda self: self.env.user.tz or 'UTC') until = fields.Date('Show Until') - recurrency_monday = fields.Boolean('Monday') - recurrency_tuesday = fields.Boolean('Tuesday') - recurrency_wednesday = fields.Boolean('Wednesday') - recurrency_thursday = fields.Boolean('Thursday') - recurrency_friday = fields.Boolean('Friday') - recurrency_saturday = fields.Boolean('Saturday') - recurrency_sunday = fields.Boolean('Sunday') + recurrency_monday = fields.Boolean('Monday', default=True) + recurrency_tuesday = fields.Boolean('Tuesday', default=True) + recurrency_wednesday = fields.Boolean('Wednesday', default=True) + recurrency_thursday = fields.Boolean('Thursday', default=True) + recurrency_friday = fields.Boolean('Friday', default=True) + recurrency_saturday = fields.Boolean('Saturday', default=True) + recurrency_sunday = fields.Boolean('Sunday', default=True) available_today = fields.Boolean('Is Displayed Today', compute='_compute_available_today', search='_search_available_today') diff --git a/addons/lunch/static/src/scss/lunch_kanban.scss b/addons/lunch/static/src/scss/lunch_kanban.scss index 2e315025398..7e660ae4b43 100644 --- a/addons/lunch/static/src/scss/lunch_kanban.scss +++ b/addons/lunch/static/src/scss/lunch_kanban.scss @@ -20,6 +20,10 @@ color: $o-brand-odoo; } + .o_flex_basis_0 { + flex-basis: 0; + } + .o_lunch_widget { min-height: 90px; max-height: 33vh; @@ -79,4 +83,4 @@ font-weight: normal !important; } } -}
\ No newline at end of file +} diff --git a/addons/lunch/static/src/xml/lunch_kanban.xml b/addons/lunch/static/src/xml/lunch_kanban.xml index bb995a6a348..aab22eaf4ae 100644 --- a/addons/lunch/static/src/xml/lunch_kanban.xml +++ b/addons/lunch/static/src/xml/lunch_kanban.xml @@ -1,6 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <templates> <span t-name="LunchKanbanWidget"> + <t t-foreach="widget.alerts" t-as="alert"> + <div class="alert alert-warning mb-0" role="alert"> + <t t-raw="alert.message"/> <!-- alert.message is coming from a fields.Html so it should be safe --> + </div> + </t> <div class="o_lunch_kanban_banner container-fluid"> <div class="o_lunch_widget row py-3 py-md-0"> <div class="o_lunch_widget_info col-12 col-md-4 card border-0"> @@ -88,11 +93,6 @@ </div> </div> </div> - <t t-foreach="widget.alerts" t-as="alert"> - <div class="alert alert-warning mb-0" role="alert"> - <t t-raw="alert.message"/> <!-- alert.message is coming from a fields.Html so it should be safe --> - </div> - </t> </span> <span t-name="currency_field" class="o_field_monetary o_field_number o_field_widget"> diff --git a/addons/lunch/views/lunch_alert_views.xml b/addons/lunch/views/lunch_alert_views.xml index 53985dd9ddd..c33ff3a3ffa 100644 --- a/addons/lunch/views/lunch_alert_views.xml +++ b/addons/lunch/views/lunch_alert_views.xml @@ -44,7 +44,7 @@ <group> <field name="mode" widget="radio"/> <field name="recipients" attrs="{'invisible': [['mode', '!=', 'chat']]}" widget="radio"/> - <field name="location_ids" widget="many2many_tags"/> + <field name="location_ids" widget="many2many_tags" required="1"/> <field name="until"/> <field name="active"/> </group> |