VRFS-1478 allow multiple session invites to same user
This commit is contained in:
parent
4d94f85421
commit
6aaddbbe50
|
|
@ -197,4 +197,5 @@ update_sms_index.sql
|
|||
connection_allow_null_locidispid.sql
|
||||
track_user_in_scores.sql
|
||||
median_aggregate.sql
|
||||
current_scores_use_median.sql
|
||||
current_scores_use_median.sql
|
||||
drop_session_invite_constraint.sql
|
||||
|
|
@ -0,0 +1 @@
|
|||
ALTER TABLE invitations DROP CONSTRAINT invitations_uniqkey;
|
||||
|
|
@ -45,10 +45,12 @@
|
|||
|
||||
if (0 == $(elemSelector + ' .friendbox').length) {
|
||||
_appendFriendSelector($(elemSelector));
|
||||
$('#btn-save-invites').click(function() {
|
||||
createInvitations(updateSessionID);
|
||||
});
|
||||
}
|
||||
|
||||
$('#btn-save-invites').click(function() {
|
||||
createInvitations(updateSessionID);
|
||||
});
|
||||
|
||||
$.ajax({
|
||||
url: "/api/invitations",
|
||||
data: { session_id: sessionId, sender: context.JK.currentUserId }
|
||||
|
|
@ -126,8 +128,7 @@
|
|||
var imgStyle = _inviteExists(data) ? 'display:none' : '';
|
||||
var invitationHtml = context.JK.fillTemplate(template,
|
||||
{userId: data,
|
||||
userName: value,
|
||||
imageStyle: imgStyle});
|
||||
userName: value});
|
||||
$('.selected-friends').append(invitationHtml);
|
||||
$(friendInput).select();
|
||||
invitedFriends.push(data);
|
||||
|
|
@ -162,22 +163,20 @@
|
|||
|
||||
function createInvitations(sessionId, onComplete) {
|
||||
var callCount = 0;
|
||||
var totalInvitations = invitedFriends.length - existingInvites.length;
|
||||
var totalInvitations = invitedFriends.length;
|
||||
invitedFriends.map(function(invite_id) {
|
||||
if (!_inviteExists(invite_id)) {
|
||||
callCount++;
|
||||
var invite = {
|
||||
music_session: sessionId,
|
||||
receiver: invite_id
|
||||
};
|
||||
$.ajax({
|
||||
type: "POST",
|
||||
url: "/api/invitations",
|
||||
data: invite
|
||||
}).done(function(response) {
|
||||
callCount--;
|
||||
}).fail(app.ajaxError);
|
||||
}
|
||||
callCount++;
|
||||
var invite = {
|
||||
music_session: sessionId,
|
||||
receiver: invite_id
|
||||
};
|
||||
$.ajax({
|
||||
type: "POST",
|
||||
url: "/api/invitations",
|
||||
data: invite
|
||||
}).done(function(response) {
|
||||
callCount--;
|
||||
}).fail(app.ajaxError);
|
||||
});
|
||||
// TODO - this is the second time I've used this pattern.
|
||||
// refactor to make a common utility for this.
|
||||
|
|
|
|||
|
|
@ -31,6 +31,6 @@
|
|||
<!-- Added Invitation Template -->
|
||||
<script type="text/template" id="template-added-invitation">
|
||||
<div user-id="{userId}" class="invitation">{userName}
|
||||
<a><%= image_tag "shared/icon_delete_sm.png", :size => "13x13", :style => "{imageStyle}" %></a>
|
||||
<a><%= image_tag "shared/icon_delete_sm.png", :size => "13x13" %></a>
|
||||
</div>
|
||||
</script>
|
||||
|
|
|
|||
Loading…
Reference in New Issue