summaryrefslogtreecommitdiff
path: root/app/Module/ResearchTaskModule.php
diff options
context:
space:
mode:
authorGreg Roach <fisharebest@webtrees.net>2019-01-11 11:44:16 +0000
committerGreg Roach <fisharebest@webtrees.net>2019-01-11 11:44:16 +0000
commitc0804649bf60e006885fb046f075cf3008bf7cb9 (patch)
tree44b1e6ffaa50288fe58c3709f13e6663c9856285 /app/Module/ResearchTaskModule.php
parenta2bad81d2834149268aae68b351f387dfde8087e (diff)
downloadwebtrees-c0804649bf60e006885fb046f075cf3008bf7cb9.tar.gz
webtrees-c0804649bf60e006885fb046f075cf3008bf7cb9.tar.bz2
webtrees-c0804649bf60e006885fb046f075cf3008bf7cb9.zip
Simplify row-mappers
Diffstat (limited to 'app/Module/ResearchTaskModule.php')
-rw-r--r--app/Module/ResearchTaskModule.php8
1 files changed, 5 insertions, 3 deletions
diff --git a/app/Module/ResearchTaskModule.php b/app/Module/ResearchTaskModule.php
index 6392dd61e9..f10051109d 100644
--- a/app/Module/ResearchTaskModule.php
+++ b/app/Module/ResearchTaskModule.php
@@ -193,9 +193,10 @@ class ResearchTaskModule extends AbstractModule implements ModuleBlockInterface
->where('f_file', '=', $tree->id())
->where('d_fact', '=', '_TODO')
->where('d_julianday1', '<', $max_julian_day)
- ->select(['f_id', 'f_gedcom'])
+ ->select(['families.*'])
+ ->distinct()
->get()
- ->map(Family::rowMapper($tree));
+ ->map(Family::rowMapper());
}
/**
@@ -215,7 +216,8 @@ class ResearchTaskModule extends AbstractModule implements ModuleBlockInterface
->where('i_file', '=', $tree->id())
->where('d_fact', '=', '_TODO')
->where('d_julianday1', '<', $max_julian_day)
- ->select(['i_id', 'i_gedcom'])
+ ->select(['individuals.*'])
+ ->distinct()
->get()
->map(Individual::rowMapper($tree));
}