diff --git a/ruby/lib/jam_ruby/models/rsvp_request.rb b/ruby/lib/jam_ruby/models/rsvp_request.rb
index 3558df969..b0359c1fb 100644
--- a/ruby/lib/jam_ruby/models/rsvp_request.rb
+++ b/ruby/lib/jam_ruby/models/rsvp_request.rb
@@ -98,11 +98,11 @@ module JamRuby
end
# verify user has not already submitted RSVP request for this slot
- user_slot = RsvpRequest.joins(:rsvp_requests_rsvp_slots)
+ rsvp = RsvpRequest.joins(:rsvp_requests_rsvp_slots)
.where(:user_id => user.id)
.where(rsvp_requests_rsvp_slots: {rsvp_slot_id: id})
- if !user_slot.blank?
+ if !rsvp.blank? && !rsvp.canceled
raise StateError, "You have already submitted an RSVP request for this slot."
end
diff --git a/web/app/assets/javascripts/dialog/rsvpSubmitDialog.js b/web/app/assets/javascripts/dialog/rsvpSubmitDialog.js
index 895927135..be8bf3afa 100644
--- a/web/app/assets/javascripts/dialog/rsvpSubmitDialog.js
+++ b/web/app/assets/javascripts/dialog/rsvpSubmitDialog.js
@@ -40,8 +40,7 @@
$.each(response.open_slots, function(index, val) {
var instrument = val.instrument_id;
- var instrumentTitleCase = context.JK.toTitleCase(instrument);
- $('.rsvp-instruments', $dialog).append('' + instrumentTitleCase + "
");
+ $('.rsvp-instruments', $dialog).append('' + val.description + " (" + val.proficiency_desc + ")
");
});
}
}