Fix (more) start/end date defaults for importers, per upstream changes
This commit is contained in:
parent
2f21e574ae
commit
e58d843ee4
3 changed files with 22 additions and 9 deletions
|
@ -61,6 +61,11 @@ class HarvestTaskImporter(base.FromRattail, rattail_harvest_importing.model.Harv
|
|||
class HarvestTimeEntryImporter(base.FromRattail, rattail_harvest_importing.model.HarvestTimeEntryImporter):
|
||||
|
||||
def query(self):
|
||||
query = super(HarvestTimeEntryImporter, self).query()
|
||||
return query.filter(self.model_class.spent_date >= self.start_date)\
|
||||
.filter(self.model_class.spent_date <= self.end_date)
|
||||
query = super().query()
|
||||
|
||||
if self.start_date:
|
||||
query = query.filter(self.model_class.spent_date >= self.start_date)
|
||||
if self.end_date:
|
||||
query = query.filter(self.model_class.spent_date <= self.end_date)
|
||||
|
||||
return query
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue