changeset 952bd62fc1b7 in trytond:default
details: https://hg.tryton.org/trytond?cmd=changeset;node=952bd62fc1b7
description:
Improve cron form view
diffstat:
trytond/ir/cron.py | 10 +++++++++-
trytond/ir/view/cron_form.xml | 12 ++++++------
2 files changed, 15 insertions(+), 7 deletions(-)
diffs (51 lines):
diff -r a2f193a792d4 -r 952bd62fc1b7 trytond/ir/cron.py
--- a/trytond/ir/cron.py Mon Apr 15 16:11:00 2019 +0200
+++ b/trytond/ir/cron.py Mon Apr 22 15:46:45 2019 +0200
@@ -23,7 +23,7 @@
('days', 'Days'),
('weeks', 'Weeks'),
('months', 'Months'),
- ], "Interval Type", required=True)
+ ], "Interval Type", sort=False, required=True)
minute = fields.Integer("Minute",
states={
'invisible': Eval('interval_type').in_(['minutes']),
@@ -80,6 +80,14 @@
def check_xml_record(crons, values):
return True
+ @classmethod
+ def view_attributes(cls):
+ return [
+ ('//label[@id="time_label"]', 'states', {
+ 'invisible': Eval('interval_type') == 'minutes',
+ }),
+ ]
+
def compute_next_call(self, now):
return (now
+ relativedelta(**{self.interval_type: self.interval_number})
diff -r a2f193a792d4 -r 952bd62fc1b7 trytond/ir/view/cron_form.xml
--- a/trytond/ir/view/cron_form.xml Mon Apr 15 16:11:00 2019 +0200
+++ b/trytond/ir/view/cron_form.xml Mon Apr 22 15:46:45 2019 +0200
@@ -13,14 +13,14 @@
</group>
<label id="time_label" string="At"/>
<group id="time" col="-1" colspan="3">
- <label name="minute"/>
- <field name="minute" xexpand="0"/>
+ <label name="weekday"/>
+ <field name="weekday" xexpand="0" widget="selection"/>
+ <label name="day"/>
+ <field name="day" xexpand="0"/>
<label name="hour"/>
<field name="hour" xexpand="0"/>
- <label name="day"/>
- <field name="day" xexpand="0"/>
- <label name="weekday"/>
- <field name="weekday" xexpand="0" widget="selection"/>
+ <label name="minute"/>
+ <field name="minute" xexpand="0"/>
</group>
<label name="next_call"/>
<field name="next_call"/>
