diff --git a/ruby/lib/jam_ruby/app/mailers/user_mailer.rb b/ruby/lib/jam_ruby/app/mailers/user_mailer.rb
index bba31d238..df2d99a27 100644
--- a/ruby/lib/jam_ruby/app/mailers/user_mailer.rb
+++ b/ruby/lib/jam_ruby/app/mailers/user_mailer.rb
@@ -21,7 +21,7 @@ module JamRuby
def confirm_email(user, signup_confirm_url)
@user = user
- @signup_confirm_url = signup_confirm_url
+ @signup_confirm_url = "#{APP_CONFIG.external_root_url}/confirm/#{user.signup_token}"
sendgrid_category "Confirm Email"
sendgrid_unique_args :type => "confirm_email"
diff --git a/web/app/assets/javascripts/dialog/rateSessionDialog.js b/web/app/assets/javascripts/dialog/rateSessionDialog.js
index 63086e9df..b45da3444 100644
--- a/web/app/assets/javascripts/dialog/rateSessionDialog.js
+++ b/web/app/assets/javascripts/dialog/rateSessionDialog.js
@@ -14,7 +14,6 @@
$('#btn-rate-session-up', $scopeSelector).removeClass('selected');
$('#btn-rate-session-down', $scopeSelector).removeClass('selected');
$('#txt-rate-session-comment',"[layout-id='rate-session-dialog']").val('');
- $('#btn-rate-session-send', $scopeSelector).attr("disabled","disabled");
}
function showDialog() {
@@ -66,7 +65,6 @@
if ($('#btn-rate-session-down').hasClass('selected')) {
$('#btn-rate-session-down').removeClass('selected')
}
- $('#btn-rate-session-send', $scopeSelector).removeAttr("disabled");
return false;
});
$('#btn-rate-session-down', $scopeSelector).click(function(evt) {
@@ -78,7 +76,6 @@
if ($('#btn-rate-session-up').hasClass('selected')) {
$('#btn-rate-session-up').removeClass('selected')
}
- $('#btn-rate-session-send', $scopeSelector).removeAttr("disabled");
return false;
});
$('#btn-rate-session-send', $scopeSelector).click(function(evt) {
@@ -87,6 +84,10 @@
closeDialog();
return false;
}
+ if (0 == rr) {
+ context.JK.Banner.showNotice('Please select the thumbs up or thumbs down when leaving a rating.
Thank you!')
+ return false;
+ }
var url = "/api/participant_histories/"+clientId+"/rating";
$.ajax({
type: "POST",
diff --git a/web/app/controllers/landings_controller.rb b/web/app/controllers/landings_controller.rb
index d271dc4ac..e94adfd42 100644
--- a/web/app/controllers/landings_controller.rb
+++ b/web/app/controllers/landings_controller.rb
@@ -597,7 +597,9 @@ class LandingsController < ApplicationController
gift_card: @code,
terms_of_service: terms_of_service,
under_13: under_13,
- skip_recaptcha: true)
+ skip_recaptcha: true,
+ musician: true,
+ instruments: [{:instrument_id => 'other', :proficiency_level => 1, :priority => 1}])
if @user.errors.any?
first = @user.errors.first
@error = "#{first[0].to_s.humanize} #{first[1]}"
diff --git a/web/app/views/landings/amazon_lessons_promo_1.slim b/web/app/views/landings/amazon_lessons_promo_1.slim
index 665b2bbf3..207a21f0c 100644
--- a/web/app/views/landings/amazon_lessons_promo_1.slim
+++ b/web/app/views/landings/amazon_lessons_promo_1.slim
@@ -36,8 +36,13 @@
javascript:
- $('a.amazon-a-button-text').on('click', function(e) {
- $('form.code-form').submit()
+ var submitted = false
+
+ $('a.amazon-a-button-text').on('click', function (e) {
+ if (!submitted) {
+ submitted = true
+ $('form.code-form').submit()
+ }
})