diff --git a/ruby/lib/jam_ruby/models/active_music_session.rb b/ruby/lib/jam_ruby/models/active_music_session.rb index 9d0de3493..b272609e8 100644 --- a/ruby/lib/jam_ruby/models/active_music_session.rb +++ b/ruby/lib/jam_ruby/models/active_music_session.rb @@ -399,6 +399,9 @@ module JamRuby day = Date.parse(day) next_day = day + 1 timezone_offset = timezone_offset.to_i + if timezone_offset > 0 + timezone_offset = "+#{timezone_offset}" + end query = query.where("scheduled_start BETWEEN TIMESTAMP WITH TIME ZONE '#{day} 00:00:00#{timezone_offset}' AND TIMESTAMP WITH TIME ZONE '#{next_day} 00:00:00#{timezone_offset}'") rescue Exception => e diff --git a/ruby/lib/jam_ruby/models/music_session.rb b/ruby/lib/jam_ruby/models/music_session.rb index 1a082c3cd..1c4a3e1ec 100644 --- a/ruby/lib/jam_ruby/models/music_session.rb +++ b/ruby/lib/jam_ruby/models/music_session.rb @@ -651,9 +651,7 @@ module JamRuby day = Date.parse(day) next_day = day + 1 timezone_offset = timezone_offset.to_i - if timezone_offset == 0 - timezone_offset = '' # no offset to specify in this case - elsif timezone_offset > 0 + if timezone_offset > 0 timezone_offset = "+#{timezone_offset}" end query = query.where("scheduled_start BETWEEN TIMESTAMP WITH TIME ZONE '#{day} 00:00:00#{timezone_offset}' diff --git a/web/app/assets/javascripts/session.js b/web/app/assets/javascripts/session.js index eb996e4ed..1a1b0bb77 100644 --- a/web/app/assets/javascripts/session.js +++ b/web/app/assets/javascripts/session.js @@ -119,12 +119,12 @@ function afterShow(data) { - if(!context.JK.JamServer.connected) { - promptLeave = false; - app.notifyAlert("Not Connected", 'To create or join a session, you must be connected to the server.'); - window.location = '/client#/home' - return; - } + if(!context.JK.JamServer.connected) { + promptLeave = false; + app.notifyAlert("Not Connected", 'To create or join a session, you must be connected to the server.'); + window.location = '/client#/home' + return; + } gearUtils.guardAgainstInvalidConfiguration(app) .fail(function() { diff --git a/web/spec/support/utilities.rb b/web/spec/support/utilities.rb index ee1af02bd..081cca030 100644 --- a/web/spec/support/utilities.rb +++ b/web/spec/support/utilities.rb @@ -344,7 +344,7 @@ def schedule_session(options = {}) find('.btn-next', text: 'PUBLISH SESSION').trigger(:click) find('h2', text: 'create session') - + sleep 1 # to get rid of this, we need to verify that the URL is /client#/home.. otherwise intermittent fails end end