agenda-libre/agenda-libre-ruby
agenda-libre/agenda-libre-ruby
2
1
Fork 0
Code Issues Pull Requests Releases Activity

Organisation submitter is set to the contact if empty

Browse Source
This commit is contained in:
echarp 2016-11-08 15:40:35 +01:00
parent cbba590d4f
commit f6e43ce10e
2 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/models/orga.rb
View File

@ -35,31 +35,29 @@ class Orga < ActiveRecord::Base
scope :geo, -> { where 'latitude is not null and longitude is not null' } scope :geo, -> { where 'latitude is not null and longitude is not null' }
before_validation do before_validation do
unless submitter.blank? # Populate submitter using contact info if absent
self.secret ||= SecureRandom.urlsafe_base64(32)[0...32] self.submitter ||= contact
end self.secret ||= SecureRandom.urlsafe_base64(32)[0...32]
self.submission_time ||= Time.zone.now self.submission_time ||= Time.zone.now
end end
after_create do after_create do
send_secret unless submitter.blank? send_secret
# Send email to moderators when an new orga is received # Send email to moderators when an new orga is received
ModerationorgaMailer.create(self).deliver_now! ModerationorgaMailer.create(self).deliver_now!
end end
after_update do after_update do
unless submitter.blank? send_secret if secret_changed? || submitter_changed?
send_secret if secret_changed?
if moderated_changed? if moderated_changed?
OrgaMailer.accept(self).deliver_now! OrgaMailer.accept(self).deliver_now!
# Send email to moderators when an orga is accepted # Send email to moderators when an orga is accepted
ModerationorgaMailer.accept(self).deliver_now! ModerationorgaMailer.accept(self).deliver_now!
else else
OrgaMailer.update(self).deliver_now! OrgaMailer.update(self).deliver_now!
# Send email to moderators when an orga is updated # Send email to moderators when an orga is updated
ModerationorgaMailer.update(self).deliver_now! ModerationorgaMailer.update(self).deliver_now!
end
end end
end end

11
test/models/orga_test.rb
View File

@ -20,17 +20,6 @@ class OrgaTest < ActiveSupport::TestCase
tags: 'hello world' tags: 'hello world'
) )
end end
assert_difference 'ActionMailer::Base.deliveries.size', 1 do
Orga.create!(
kind: Kind.first,
name: 'Tested organisation',
url: 'http://example.com',
region: Region.first,
contact: 'contact@example.com',
tags: 'hello world'
)
end
end end
test 'set and send secret' do test 'set and send secret' do