seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

VRFS-1746 RSVP cancel dialog bug fixes

This commit is contained in:
Brian Smith 2014-05-29 22:19:30 -04:00
parent d4a21e62f3
commit a607124e63
3 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruby/lib/jam_ruby/models/notification.rb
View File

@ -712,7 +712,7 @@ module JamRuby
@@mq_router.publish_to_user(target_user.id, msg)
begin
UserMailer.send_scheduled_session_rsvp_cancelled(target_user.email, notification_msg, music_session).deliver
UserMailer.scheduled_session_rsvp_cancelled(target_user.email, notification_msg, music_session).deliver
rescue => e
@@log.error("Unable to send send_scheduled_session_rsvp_cancelled email to offline user #{target_user.email} #{e}")
end

16
web/app/assets/javascripts/rsvpCancelDialog.js
View File

@ -46,15 +46,11 @@
var cancelOption = $('input[name="cancel"]:checked', $screen).val();
rest.cancelRsvpRequest(sessionId, rsvpRequestId, cancelOption)
.done(function(response) {
console.log("add session comment");
var comment = $.trim($('#txtComment', $screen).val());
if (comment.length > 0) {
rest.addSessionInfoComment(sessionId, comment)
.done(function(response) {
if (!error) {
app.layout.closeDialog(dialogId);
$btnCancel.trigger("rsvpCancelEvent");
}
})
.fail(function(xhr) {
error = true;
@ -62,15 +58,13 @@
$('.error', $screen).show();
});
}
else {
if (!error) {
app.layout.closeDialog(dialogId);
$btnCancel.trigger("rsvpCancelEvent");
}
if (!error) {
app.layout.closeDialog(dialogId);
$btnCancel.trigger("rsvpCancelEvent");
}
})
.fail(function(xhr) {
error = true;
$('.error', $screen).html("Unexpected error occurred while cancelling RSVP request (" + xhr.status + ")");
$('.error', $screen).show();
});

15
web/app/assets/javascripts/rsvpSubmitDialog.js
View File

@ -78,10 +78,7 @@
if (comment.length > 0) {
rest.addSessionInfoComment(sessionId, comment)
.done(function(response) {
if (!error) {
app.layout.closeDialog(dialogId);
$btnSubmit.trigger("rsvpSubmitEvent");
}
})
.fail(function(xhr) {
error = true;
@ -89,15 +86,13 @@
$('.error', $screen).show();
});
}
else {
if (!error) {
app.layout.closeDialog(dialogId);
$btnSubmit.trigger("rsvpSubmitEvent");
}
if (!error) {
app.layout.closeDialog(dialogId);
$btnSubmit.trigger("rsvpSubmitEvent");
}
})
.fail(function(xhr) {
error = true;
$('.error', $screen).html("Unexpected error occurred while saving RSVP request (" + xhr.status + ")");
$('.error', $screen).show();
});