Fixed registration emails and modified the schedule
This commit is contained in:
@@ -635,7 +635,7 @@ class ApplicationController < LinguaFrancaApplicationController
|
||||
} unless amenities.include? need
|
||||
end
|
||||
|
||||
@schedule[day][:times][time][:item][:workshops][ids[i]][:status][:conflict_score] = workshop_i.interested.present? ? (conflicts.length / workshop_i.interested.size) : 0
|
||||
@schedule[day][:times][time][:item][:workshops][ids[i]][:status][:conflict_score] = (conflicts || []).length
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -201,13 +201,13 @@ class ConferencesController < ApplicationController
|
||||
end
|
||||
|
||||
# workshops is the last step
|
||||
if @register_template == :workshops
|
||||
UserMailer.send_mail :registration_confirmation do
|
||||
{
|
||||
:args => @registration
|
||||
}
|
||||
end
|
||||
end
|
||||
# if @register_template == :workshops
|
||||
# UserMailer.send_mail :registration_confirmation do
|
||||
# {
|
||||
# :args => @registration
|
||||
# }
|
||||
# end
|
||||
# end
|
||||
end
|
||||
|
||||
@registration.save!
|
||||
|
||||
Reference in New Issue
Block a user