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-2804 - fix code to find the jamtrack ID correctly based on recent client changes

This commit is contained in:
Seth Call 2015-02-19 15:56:42 -06:00
parent 9345d65f06
commit 38849a1c44
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
web/app/assets/javascripts/session.js
View File

@ -1100,19 +1100,14 @@
// find the track or tracks that correspond to the mixer
var correspondingTracks = []
$.each(jamTracks, function(i, jamTrack) {
if(mixer.id.indexOf("L") == 0) {
if(mixer.id.substring(1) == jamTrack.id) {
if(mixer.id == jamTrack.id) {
correspondingTracks.push(jamTrack);
}
else {
// this should not be possible
alert("Invalid state: the backing track had neither persisted_track_id or persisted_client_id");
}
}
});
if(correspondingTracks.length == 0) {
noCorrespondingTracks = true;
logger.error("could not correlate jam tracks", jamTrackMixers, jamTracks)
app.notify({
title: "Unable to Open JamTrack",
text: "Could not correlate server and client tracks",
@ -2357,7 +2352,7 @@
downloadJamTrack = null
}
downloadJamTrack = new context.JK.DownloadJamTrack(app, jamTrack.id, 'large');
downloadJamTrack = new context.JK.DownloadJamTrack(app, jamTrack, 'large');
// the widget indicates when it gets to any transition; we can hide it once it reaches completion
$(downloadJamTrack).on(EVENTS.JAMTRACK_DOWNLOADER_STATE_CHANGED, function(e, data) {

2
web/lib/tasks/sample_data.rake
View File

@ -1,6 +1,6 @@
require 'factory_girl'
require 'open-uri'
require './spec/factories.rb' # useful when run on a server
#require './spec/factories.rb' # useful when run on a server
namespace :db do
desc "Add a simple one track recording to the database"