Fixed registration emails and modified the schedule

This commit is contained in:
Godwin
2016-09-21 21:37:16 -07:00
parent 2fe8b3c93d
commit 0770fd28e8
7 changed files with 77 additions and 32 deletions
+1 -1
View File
@@ -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
+7 -7
View File
@@ -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!