diff --git a/ruby/.gitignore b/ruby/.gitignore index be1654c09..76db742a2 100644 --- a/ruby/.gitignore +++ b/ruby/.gitignore @@ -9,6 +9,7 @@ _yardoc coverage doc/ lib/bundler/man +jt_metadata.json pkg rdoc spec/reports diff --git a/ruby/jt_metadata.json b/ruby/jt_metadata.json deleted file mode 100644 index dfaa6ab96..000000000 --- a/ruby/jt_metadata.json +++ /dev/null @@ -1 +0,0 @@ -{"container_file": "/var/folders/05/1jpzfcln1hq9p666whnd7chr0000gn/T/d20150716-51872-twucnn/jam-track-75.jkz", "version": "0", "coverart": null, "rsa_priv_file": "/var/folders/05/1jpzfcln1hq9p666whnd7chr0000gn/T/d20150716-51872-twucnn/skey.pem", "tracks": [{"name": "/var/folders/05/1jpzfcln1hq9p666whnd7chr0000gn/T/d20150716-51872-twucnn/a3ecd76f-6176-4595-8bee-ddc9896685fe.ogg", "trackName": "track_00"}], "rsa_pub_file": "/var/folders/05/1jpzfcln1hq9p666whnd7chr0000gn/T/d20150716-51872-twucnn/pkey.pem", "jamktrack_info": "/var/folders/05/1jpzfcln1hq9p666whnd7chr0000gn/T/tmpmYAmj7"} \ No newline at end of file diff --git a/ruby/lib/jam_ruby/models/score.rb b/ruby/lib/jam_ruby/models/score.rb index f45248376..d19832c65 100644 --- a/ruby/lib/jam_ruby/models/score.rb +++ b/ruby/lib/jam_ruby/models/score.rb @@ -18,7 +18,7 @@ module JamRuby raise "blocidispid must be positive" if blocidispid <= 0 raise "score must be positive" if score <= 0 ascore = Score.create(alocidispid: alocidispid, anodeid: anodeid, aaddr: aaddr, auserid: user_info[:auserid], alatencytestid: user_info[:alatencytestid], blocidispid: blocidispid, bnodeid: bnodeid, baddr: baddr, buserid: user_info[:buserid], blatencytestid: user_info[:blatencytestid], score: score, scorer: 0, score_dt: score_dt, scoring_data: score_data) - bscore = Score.create(alocidispid: blocidispid, anodeid: bnodeid, aaddr: baddr, auserid: user_info[:buserid], blatencytestid: user_info[:blatencytestid], blocidispid: alocidispid, bnodeid: anodeid, baddr: aaddr, buserid: user_info[:auserid], blatencytestid: user_info[:alatencytestid], score: score, scorer: 1, score_dt: score_dt) if alocidispid != blocidispid + bscore = Score.create(alocidispid: blocidispid, anodeid: bnodeid, aaddr: baddr, auserid: user_info[:buserid], alatencytestid: user_info[:blatencytestid], blocidispid: alocidispid, bnodeid: anodeid, baddr: aaddr, buserid: user_info[:auserid], blatencytestid: user_info[:alatencytestid], score: score, scorer: 1, score_dt: score_dt) if alocidispid != blocidispid Score.connection.execute("select update_current_network_scores(#{alocidispid}, #{blocidispid})") return [ascore, bscore] end diff --git a/web/app/assets/javascripts/bandProfile.js b/web/app/assets/javascripts/bandProfile.js index b7501373b..994ea1838 100644 --- a/web/app/assets/javascripts/bandProfile.js +++ b/web/app/assets/javascripts/bandProfile.js @@ -437,6 +437,7 @@ } function bindMusicians(musicians, isPending) { + $('#band-profile-members').empty(); // for race conditions seen most often in testing $.each(musicians, function(index, musician) { var instrumentLogoHtml = ''; if ("instruments" in musician && musician.instruments != null) {