From 0aba92650c75d56a11d7762247aa0ddb0876e90b Mon Sep 17 00:00:00 2001 From: Seth Call Date: Mon, 18 Jul 2016 18:09:01 -0500 Subject: [PATCH] remove is jamblaster check for now --- .../react-components/SessionOtherTracks.js.jsx.coffee | 4 ++-- web/app/helpers/music_session_helper.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/app/assets/javascripts/react-components/SessionOtherTracks.js.jsx.coffee b/web/app/assets/javascripts/react-components/SessionOtherTracks.js.jsx.coffee index 7ab60ff13..298dff75a 100644 --- a/web/app/assets/javascripts/react-components/SessionOtherTracks.js.jsx.coffee +++ b/web/app/assets/javascripts/react-components/SessionOtherTracks.js.jsx.coffee @@ -16,8 +16,8 @@ MixerActions = context.MixerActions for participant in session.otherParticipants() - if participant.is_jamblaster - continue + #if participant.is_jamblaster + #continue if participant.client_id == @app.clientId participant.user.possessive = "Your" diff --git a/web/app/helpers/music_session_helper.rb b/web/app/helpers/music_session_helper.rb index 8eb7119fa..bbe7055f2 100644 --- a/web/app/helpers/music_session_helper.rb +++ b/web/app/helpers/music_session_helper.rb @@ -85,7 +85,7 @@ module MusicSessionHelper if tz options << "" end - + end options.html_safe end