From 13b1bffa703f713c817d75478b592dc623a49203 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Wed, 2 Jul 2014 15:22:31 -0500 Subject: [PATCH 1/2] * null protect scheduled_start field --- web/app/views/api_music_sessions/show_history.rabl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/app/views/api_music_sessions/show_history.rabl b/web/app/views/api_music_sessions/show_history.rabl index 0be4fc700..664fd4bc0 100644 --- a/web/app/views/api_music_sessions/show_history.rabl +++ b/web/app/views/api_music_sessions/show_history.rabl @@ -35,8 +35,8 @@ else current_user.has_rsvp(history) end - node :scheduled_start do |start| - start.scheduled_start.utc.strftime("%a %e %B %Y %H:%M:%S") + node :scheduled_start do |history| + history.scheduled_start.utc.strftime("%a %e %B %Y %H:%M:%S") if history.scheduled_start end child(:creator => :creator) { From bd910abee9b9e55ef4f480d04e1571960cf27aa4 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Wed, 2 Jul 2014 15:43:38 -0500 Subject: [PATCH 2/2] * VRFS-1680 - working mostly... but the backgrounding isn't yet working when selected --- web/app/assets/javascripts/banner.js | 2 ++ web/app/assets/javascripts/shutdownDialog.js | 10 +++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/web/app/assets/javascripts/banner.js b/web/app/assets/javascripts/banner.js index b2e8a89a8..863e5dd98 100644 --- a/web/app/assets/javascripts/banner.js +++ b/web/app/assets/javascripts/banner.js @@ -57,6 +57,8 @@ } } + logger.debug("opening banner:" + options.title); + var $h1 = $banner.find('h1'); $h1.html(options.title); diff --git a/web/app/assets/javascripts/shutdownDialog.js b/web/app/assets/javascripts/shutdownDialog.js index 94aea13f4..60c837861 100644 --- a/web/app/assets/javascripts/shutdownDialog.js +++ b/web/app/assets/javascripts/shutdownDialog.js @@ -12,17 +12,21 @@ { title: "Close JamKazam Application", buttons: [ {name: 'Completely Shut Down the App', click: function() {context.jamClient.ShutdownApplication()}}, - {name: 'Let App Run in Background', click: function() {context.jamClient.ShutdownApplication()}} + {name: 'Let App Run in Background', click: function() { + context.jamClient.RegisterQuitCallback("window.JK.ShutdownDialogCallback"); + context.JK.Banner.hide(); + } + } ], html: $('#template-shutdown-prompt').html()}); } function initialize() { - //context.jamClient.RegisterQuitCallback("window.JK.ShutdownDialogCallback"); + context.jamClient.RegisterQuitCallback("window.JK.ShutdownDialogCallback"); } function quitCallback(options) { - logger.debug("oh hai"); + logger.debug("shutdown event"); show(); }