From 8f396cb6e9c90112fa2c6f77339ffdbe090f2585 Mon Sep 17 00:00:00 2001 From: Nick Hall Date: Sun, 22 May 2016 18:26:34 +0100 Subject: [PATCH] 9314: Allow place selection both individually and by filter Add the places selected individually to the list generated by the filter. --- gramps/plugins/textreport/placereport.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gramps/plugins/textreport/placereport.py b/gramps/plugins/textreport/placereport.py index 4d0a7901d..c956c212d 100644 --- a/gramps/plugins/textreport/placereport.py +++ b/gramps/plugins/textreport/placereport.py @@ -95,13 +95,15 @@ class PlaceReport(Report): self.sort = Sort(self.database) + self.place_handles = [] if self.filter.get_name() != '': # Use the selected filter to provide a list of place handles plist = self.database.iter_place_handles() self.place_handles = self.filter.apply(self.database, plist) - else: - # Use the place handles selected without a filter - self.place_handles = self.__get_place_handles(places) + + if places: + # Add places selected individually + self.place_handles += self.__get_place_handles(places) if not self.place_handles: raise ReportError(_('Place Report'),