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-2067 fix bug where latency badge was missing for in session users

This commit is contained in:
Brian Smith 2014-09-25 09:08:01 -04:00
parent 0c31299b7d
commit 2a2445bcba
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
web/app/assets/javascripts/sessionList.js
View File

@ -97,7 +97,7 @@
}
}
var sessionVals = buildSessionObject(session, notationFileHtml, rsvpFirst3UsersHtml, rsvpRemainingUsersHtml, openSlotsFirst3Html, openSlotsRemainingHtml, latencyFirst3Html, latencyRemainingHtml);
var sessionVals = buildSessionObject(session, notationFileHtml, rsvpFirst3UsersHtml, rsvpRemainingUsersHtml, openSlotsFirst3Html, openSlotsRemainingHtml, latencyFirst3Html, latencyRemainingHtml, latencyInSessionHtml);
sessionVals.in_session_musicians = inSessionUsersHtml.length > 0 ? inSessionUsersHtml : 'N/A';
sessionVals.join_link_display_style = showJoinLink ? "block" : "none";
@ -235,7 +235,7 @@
}
var sessionVals = buildSessionObject(session, notationFileHtml, rsvpFirst3UsersHtml, rsvpRemainingUsersHtml,
openSlotsFirst3Html, openSlotsRemainingHtml, latencyFirst3Html, latencyRemainingHtml);
openSlotsFirst3Html, openSlotsRemainingHtml, latencyFirst3Html, latencyRemainingHtml, '');
sessionVals.scheduled_start = session.pretty_scheduled_start_with_timezone;
@ -339,7 +339,7 @@
}
}
function buildSessionObject(session, notationFileHtml, rsvpFirst3UsersHtml, rsvpRemainingUsersHtml, openSlotsFirst3Html, openSlotsRemainingHtml, latencyFirst3Html, latencyRemainingHtml) {
function buildSessionObject(session, notationFileHtml, rsvpFirst3UsersHtml, rsvpRemainingUsersHtml, openSlotsFirst3Html, openSlotsRemainingHtml, latencyFirst3Html, latencyRemainingHtml, latencyInSessionHtml) {
return {
id: session.id,
name: session.name,
@ -352,6 +352,7 @@
open_slots_remaining: openSlotsRemainingHtml.length > 0 ? openSlotsRemainingHtml : 'No slots available',
latency_first_3: latencyFirst3Html,
latency_remaining: latencyRemainingHtml,
latency_in_session: latencyInSessionHtml,
language: session.language_description,
musician_access: session.musician_access_description,
fan_access: session.fan_access_description,
@ -378,7 +379,8 @@
avatar_url: context.JK.resolveAvatarUrl(participant.user.photo_url),
profile_url: "/client#/profile/" + id,
musician_name: name,
instruments: instrumentLogoHtml
instruments: instrumentLogoHtml,
more_link: ''
};
var musicianHtml = context.JK.fillTemplate($musicianTemplate.html(), musicianVals);

5
web/app/views/clients/_findSession.html.erb
View File

@ -132,6 +132,11 @@
</table>
</td>
<td width="10%" class="latency">
<div class="center">
<table class="musicians" cellpadding="0" cellspacing="0">
{latency_in_session}
</table>
</div>
<div class="center">
<table class="musicians" cellpadding="0" cellspacing="0">
{latency_first_3}