diff --git a/ruby/lib/jam_ruby/models/band.rb b/ruby/lib/jam_ruby/models/band.rb index 6d6c6f96e..eeb71ad59 100644 --- a/ruby/lib/jam_ruby/models/band.rb +++ b/ruby/lib/jam_ruby/models/band.rb @@ -226,8 +226,7 @@ module JamRuby end # helper method for creating / updating a Band - def self.save(user, params) - puts "Band.save with #{user}, #{params}" + def self.save(user, params) band = build_band(user, params) if band.save diff --git a/ruby/lib/jam_ruby/models/online_presence.rb b/ruby/lib/jam_ruby/models/online_presence.rb index 6f97baa7f..ed4f498bd 100644 --- a/ruby/lib/jam_ruby/models/online_presence.rb +++ b/ruby/lib/jam_ruby/models/online_presence.rb @@ -62,7 +62,9 @@ module JamRuby private def self.auth_player(target_player, options={}) - raise JamPermissionError, PERMISSION_MSG if target_player.nil? || options[:player_id] != target_player.id + if target_player.nil? || options[:player_id] != target_player.id + raise JamPermissionError, PERMISSION_MSG + end end end end \ No newline at end of file diff --git a/web/app/assets/javascripts/band_setup.js b/web/app/assets/javascripts/band_setup.js index 5e0e71222..15524566d 100644 --- a/web/app/assets/javascripts/band_setup.js +++ b/web/app/assets/javascripts/band_setup.js @@ -37,11 +37,9 @@ var $screen=$("#band-setup") var $samples = $screen.find(".account-profile-samples") var $selectedInstruments=[] - - console.log("------------------------------------------") + var accountProfileSamples = new JK.AccountProfileSamples(app, $screen, loadBandCallback, rest.updateBand) - accountProfileSamples.initialize() - console.log("==========================================") + accountProfileSamples.initialize() function navBack() { if (currentStep>0) { @@ -245,9 +243,37 @@ band.instruments.push(h) }) + if(!isNewBand()) { + mergePerformanceSamples(band) + } + return band; } + function mergePerformanceSamples(band) { + // Collect and merge data from this sub-widget: + var performanceSampleData = accountProfileSamples.buildPlayer() + band.website=performanceSampleData.website + band.online_presences=performanceSampleData.online_presences + band.performance_samples=performanceSampleData.performance_samples + + // Change player id to that of band. Widget currently hardwires current user id: + if(band.online_presences) { + for (var i=0; i