cco/loops
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use empty workitem_dayfrom_default option for empty start date

Browse source
This commit is contained in:
Helmut Merz 2017-05-09 12:07:37 +02:00
parent efb2c8ba71
commit 536f204a03
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
organize/work/report.py
View file

@ -1,5 +1,5 @@
# #
# Copyright (c) 2016 Helmut Merz helmutm@cy55.de # Copyright (c) 2017 Helmut Merz helmutm@cy55.de
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -147,8 +147,11 @@ class ActivityField(VocabularyField):
def daysAgoByOption(context): def daysAgoByOption(context):
days = 7 days = 7
opt = context.view.typeOptions('workitem_dayfrom_default') opt = context.view.typeOptions('workitem_dayfrom_default')
if opt and opt[0].isdigit(): if opt:
days = int(opt[0]) if opt is True or not opt[0].isdigit():
return None
else:
days = int(opt[0])
return (date.today() - timedelta(days)).isoformat() return (date.today() - timedelta(days)).isoformat()