[IMP] lunch: back2basics

closes odoo/odoo#38899

X-original-commit: f4dbee9b844015e95afd5edf892489582cf1f397
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
This commit is contained in:
RomainLibert
2019-10-16 16:39:16 +00:00
committed by fw-bot
parent 3daec8b5fb
commit d4fb89cd25
4 changed files with 18 additions and 14 deletions
+7 -7
View File
@@ -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')
@@ -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;
}
}
}
}
+5 -5
View File
@@ -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">
+1 -1
View File
@@ -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>