diff --git a/web/app/assets/javascripts/inviteMusicians.js b/web/app/assets/javascripts/inviteMusicians.js index 604641e1d..1158eb7df 100644 --- a/web/app/assets/javascripts/inviteMusicians.js +++ b/web/app/assets/javascripts/inviteMusicians.js @@ -49,10 +49,9 @@ createInvitations(updateSessionID); }); } - $.ajax({ - url: "/api/invitations", - data: { session_id: sessionId, sender: context.JK.currentUserId } - }).done(function(response) { + + rest.getMusicianInvites({ session_id: sessionId, sender: context.JK.currentUserId }) + .done(function(response) { response.map(function(item) { var dd = item['receiver']; existingInvites.push(dd.id); @@ -164,17 +163,14 @@ 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) { + rest.createMusicianInvite({ + music_session: sessionId, + receiver: invite_id + }) + .done(function(response) { callCount--; - }).fail(app.ajaxError); + }) + .fail(app.ajaxError); } }); // TODO - this is the second time I've used this pattern. diff --git a/web/app/assets/javascripts/jam_rest.js b/web/app/assets/javascripts/jam_rest.js index ea41b8a9d..36cdcffc7 100644 --- a/web/app/assets/javascripts/jam_rest.js +++ b/web/app/assets/javascripts/jam_rest.js @@ -762,6 +762,26 @@ }); } + function getMusicianInvites(options) { + return $.ajax({ + type: "GET", + dataType: "json", + data: options, + url: '/api/invitations' + }) + } + + function createMusicianInvite(options) { + return $.ajax({ + type: "POST", + dataType: "json", + url: '/api/invitations', + contentType: 'application/json', + processData:false, + data: JSON.stringify(options) + }) + } + function postFeedback(email, body) { return $.ajax({ type: "POST", @@ -1228,6 +1248,8 @@ this.getSession = getSession; this.getClientDownloads = getClientDownloads; this.createEmailInvitations = createEmailInvitations; + this.createMusicianInvite = createMusicianInvite; + this.getMusicianInvites = getMusicianInvites; this.postFeedback = postFeedback; this.getFeeds = getFeeds; this.serverHealthCheck = serverHealthCheck; diff --git a/web/app/assets/stylesheets/client/createSession.css.scss b/web/app/assets/stylesheets/client/createSession.css.scss index 60c48f5c4..68e77b98c 100644 --- a/web/app/assets/stylesheets/client/createSession.css.scss +++ b/web/app/assets/stylesheets/client/createSession.css.scss @@ -114,10 +114,10 @@ .session-list { height: 250px; overflow: auto; - text-align: center; + text-align: left; ul#scheduled-session-list { - margin-left: 0px; + margin-left: 3px; list-style: none; li { margin-bottom: 5px;