5098: fix a runaway merge artifact

svn: r23365
This commit is contained in:
Vassilii Khachaturov 2013-10-22 15:07:47 +00:00
parent 940fb10ecc
commit 47b9144ed1

View File

@ -1085,7 +1085,7 @@ class WebCalReport(Report):
with self._user.progress(_("Web Calendar Report"), with self._user.progress(_("Web Calendar Report"),
_('Applying Filter...'), _('Applying Filter...'),
db.get_number_of_people()) as step: db.get_number_of_people()) as step:
people = self.filter.apply(db, people, step_progress) people = self.filter.apply(db, people, step)
with self._user.progress(_("Web Calendar Report"), with self._user.progress(_("Web Calendar Report"),
_("Reading database..."), len(people)) as step: _("Reading database..."), len(people)) as step: