Skip to content

Add not statements for event mail creator, and fix event_email to event_mail #683

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
koenjdejong wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add not statements for event mail creator, and fix event_email to event_mail #683

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions app/models/event.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,14 @@ def attendee_count
self.signups.count + self.external_signups.count
end

def send_new_event_email
# Send new event to all leden who have new_event_email enabled
def send_new_event_mail
Copy link
Copy Markdown
Member

@dexbleeker dexbleeker May 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gaat deze rename goed? Waar callen we hem?

Copy link
Copy Markdown
Collaborator

@jackozi jackozi May 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nee, gaat niet goed.

webapp/app/controllers/events_controller.rb

Line 60 in d960de1

event.send_new_event_email

# Send new event to all leden who have new_event_mail enabled
if self.usergroup_id.nil?
unless self.attendance # If not dispuutsborrel
User.intern.where(new_event_mail: true).each { |user| UserMailer.mail_new_event(user, self).deliver }
User.intern.where(new_event_mail: true).where.not(id: self.user_id).each { |user| UserMailer.mail_new_event(user, self).deliver }
Copy link
Copy Markdown
Collaborator

@jackozi jackozi May 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
User.intern.where(new_event_mail: true).where.not(id: self.user_id).each { |user| UserMailer.mail_new_event(user, self).deliver }
User.intern.where(new_event_mail: true).excluding(user).each { |user| UserMailer.mail_new_event(user, self).deliver }

zou volgens mij ook moeten werken

end
else
self.usergroup.users.where(new_event_mail: true).each { |user| UserMailer.mail_new_event(user, self).deliver }
self.usergroup.users.where(new_event_mail: true).where.not(id: self.user_id).each { |user| UserMailer.mail_new_event(user, self).deliver }
end
end

Expand Down
Loading