* VRFS-900 check for no tracks when you land directly on session screen, and if you find session
This commit is contained in:
parent
a3289c5d4c
commit
4f626cc644
|
|
@ -330,11 +330,10 @@ describe MusicSession do
|
|||
|
||||
# scores!
|
||||
|
||||
ActiveRecord::Base.logger = Logger.new(STDOUT)
|
||||
#ActiveRecord::Base.logger = Logger.new(STDOUT)
|
||||
music_sessions = MusicSession.nindex(user, client_id: c3.client_id).take(100)
|
||||
#music_sessions = MusicSession.index(user).take(100)
|
||||
ActiveRecord::Base.logger = nil
|
||||
puts(music_sessions.inspect)
|
||||
#ActiveRecord::Base.logger = nil
|
||||
|
||||
music_sessions.length.should == 2
|
||||
music_sessions[0].id.should == later_session.id
|
||||
|
|
|
|||
|
|
@ -275,7 +275,7 @@
|
|||
|
||||
function afterShow(data) {
|
||||
|
||||
if (!(context.JK.hasOneConfiguredDevice())) {
|
||||
if (!context.JK.hasOneConfiguredDevice() || context.JK.TrackHelpers.getUserTracks(context.jamClient).length == 0) {
|
||||
app.afterFtue = function() { initializeSession(); };
|
||||
app.cancelFtue = function() { promptLeave = false; window.location = '/client#/home' };
|
||||
app.layout.startNewFtue();
|
||||
|
|
|
|||
|
|
@ -141,13 +141,14 @@
|
|||
|
||||
$('.join-link', $parentRow).click(function(evt) {
|
||||
// If no FTUE, show that first.
|
||||
if (!(context.JK.hasOneConfiguredDevice())) {
|
||||
if (!context.JK.hasOneConfiguredDevice() || context.JK.TrackHelpers.getUserTracks(context.jamClient).length == 0) {
|
||||
app.afterFtue = function() { joinClick(session.id); };
|
||||
app.layout.startNewFtue();
|
||||
return;
|
||||
} else {
|
||||
joinClick(session.id);
|
||||
}
|
||||
|
||||
return false;
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue