# HG changeset patch # User bsw # Date 1462390682 -7200 # Node ID 5aecbbb04a422dc6faa034576b7eaeb0cdf173d0 # Parent fb62b2c24fb5d66d87592145d4f002d9c3a24d93 Added missing conditions to events for notification selector diff -r fb62b2c24fb5 -r 5aecbbb04a42 model/event.lua --- a/model/event.lua Wed May 04 21:37:27 2016 +0200 +++ b/model/event.lua Wed May 04 21:38:02 2016 +0200 @@ -56,6 +56,9 @@ :add_where("now() - event_for_notification.occurrence BETWEEN '-3 days'::interval AND '3 days'::interval") -- do not notify a member about the events caused by the member :add_where("event_for_notification.member_id ISNULL OR event_for_notification.member_id != member.id") + :add_where("member.notify_email NOTNULL") + :add_where("NOT member.locked") + :add_where("NOT member.disable_notifications") :exec() io.stderr:write("Sending notifications for event " .. self.id .. " to " .. (#members_to_notify) .. " members\n")