From 2a2445bcbab918260b895ad9b29088a25d579ca0 Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Thu, 25 Sep 2014 09:08:01 -0400 Subject: [PATCH] VRFS-2067 fix bug where latency badge was missing for in session users --- web/app/assets/javascripts/sessionList.js | 10 ++++++---- web/app/views/clients/_findSession.html.erb | 5 +++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/web/app/assets/javascripts/sessionList.js b/web/app/assets/javascripts/sessionList.js index 0e9a53e8e..06d26efa6 100644 --- a/web/app/assets/javascripts/sessionList.js +++ b/web/app/assets/javascripts/sessionList.js @@ -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); diff --git a/web/app/views/clients/_findSession.html.erb b/web/app/views/clients/_findSession.html.erb index b790ab331..4f2b383bc 100644 --- a/web/app/views/clients/_findSession.html.erb +++ b/web/app/views/clients/_findSession.html.erb @@ -132,6 +132,11 @@ +
+ + {latency_in_session} +
+
{latency_first_3}