From ae8b6ebbc7a7dc40e098915bde0ad362caeb11ab Mon Sep 17 00:00:00 2001 From: Seth Call Date: Tue, 4 Feb 2014 17:05:38 +0000 Subject: [PATCH] * renaming all ShareDialog to ShareSessionDialog --- admin/app/controllers/artifacts_controller.rb | 12 ++++++++---- web/app/assets/javascripts/playbackControls.js | 1 + .../{shareDialog.js => shareSessionDialog.js} | 2 +- web/app/assets/javascripts/web/web.js | 2 +- web/app/assets/stylesheets/client/client.css | 2 +- ...reDialog.css.scss => shareSessionDialog.css.scss} | 0 web/app/assets/stylesheets/web/web.css | 2 +- web/app/views/clients/_session.html.erb | 2 +- ...eDialog.html.erb => _shareSessionDialog.html.erb} | 0 web/app/views/clients/index.html.erb | 4 ++-- web/app/views/music_sessions/show.html.erb | 8 ++++---- web/app/views/recordings/show.html.erb | 8 ++++---- 12 files changed, 24 insertions(+), 19 deletions(-) rename web/app/assets/javascripts/{shareDialog.js => shareSessionDialog.js} (98%) rename web/app/assets/stylesheets/client/{shareDialog.css.scss => shareSessionDialog.css.scss} (100%) rename web/app/views/clients/{_shareDialog.html.erb => _shareSessionDialog.html.erb} (100%) diff --git a/admin/app/controllers/artifacts_controller.rb b/admin/app/controllers/artifacts_controller.rb index 8e7012eff..3fb5cc5cc 100644 --- a/admin/app/controllers/artifacts_controller.rb +++ b/admin/app/controllers/artifacts_controller.rb @@ -11,12 +11,16 @@ class ArtifactsController < ApplicationController file = params[:file] environment = params[:environment] - @artifact = ArtifactUpdate.find_or_create_by_product_and_environment(product, environment) + ArtifactUpdate.transaction do + # VRFS-1071: Postpone client update notification until installer is available for download + ArtifactUpdate.connection.execute('SET TRANSACTION ISOLATION LEVEL READ COMMITTED') + @artifact = ArtifactUpdate.find_or_create_by_product_and_environment(product, environment) - @artifact.version = version - @artifact.uri = file + @artifact.version = version + @artifact.uri = file - @artifact.save + @artifact.save + end unless @artifact.errors.any? render :json => {}, :status => :ok diff --git a/web/app/assets/javascripts/playbackControls.js b/web/app/assets/javascripts/playbackControls.js index cf1df1323..1df7e6f1c 100644 --- a/web/app/assets/javascripts/playbackControls.js +++ b/web/app/assets/javascripts/playbackControls.js @@ -168,6 +168,7 @@ currentTimeMs = playbackDurationMs; stopPlay(); endReached = true; + console.log("end reached"); } else { return; diff --git a/web/app/assets/javascripts/shareDialog.js b/web/app/assets/javascripts/shareSessionDialog.js similarity index 98% rename from web/app/assets/javascripts/shareDialog.js rename to web/app/assets/javascripts/shareSessionDialog.js index dff0ce41b..24ee53d5b 100644 --- a/web/app/assets/javascripts/shareDialog.js +++ b/web/app/assets/javascripts/shareSessionDialog.js @@ -2,7 +2,7 @@ "use strict"; context.JK = context.JK || {}; - context.JK.ShareDialog = function(app) { + context.JK.ShareSessionDialog = function(app) { var logger = context.JK.logger; var rest = context.JK.Rest(); diff --git a/web/app/assets/javascripts/web/web.js b/web/app/assets/javascripts/web/web.js index ea049bbd4..03b14c5b0 100644 --- a/web/app/assets/javascripts/web/web.js +++ b/web/app/assets/javascripts/web/web.js @@ -8,7 +8,7 @@ //= require web/signupDialog //= require web/signinDialog //= require invitationDialog -//= require shareDialog +//= require shareSessionDialog //= require layout //= require user_dropdown //= require jamkazam diff --git a/web/app/assets/stylesheets/client/client.css b/web/app/assets/stylesheets/client/client.css index 57f1af430..a86d4cf7f 100644 --- a/web/app/assets/stylesheets/client/client.css +++ b/web/app/assets/stylesheets/client/client.css @@ -32,7 +32,7 @@ *= require ./search *= require ./ftue *= require ./invitationDialog - *= require ./shareDialog + *= require ./shareSessionDialog *= require ./recordingFinishedDialog *= require ./localRecordingsDialog *= require ./createSession diff --git a/web/app/assets/stylesheets/client/shareDialog.css.scss b/web/app/assets/stylesheets/client/shareSessionDialog.css.scss similarity index 100% rename from web/app/assets/stylesheets/client/shareDialog.css.scss rename to web/app/assets/stylesheets/client/shareSessionDialog.css.scss diff --git a/web/app/assets/stylesheets/web/web.css b/web/app/assets/stylesheets/web/web.css index de27dc5bc..9d047eb01 100644 --- a/web/app/assets/stylesheets/web/web.css +++ b/web/app/assets/stylesheets/web/web.css @@ -7,7 +7,7 @@ *= require client/user_dropdown *= require client/dialog *= require client/invitationDialog -*= require client/shareDialog +*= require client/shareSessionDialog *= require web/main *= require web/footer *= require web/recordings diff --git a/web/app/views/clients/_session.html.erb b/web/app/views/clients/_session.html.erb index e12b7e121..cbf3d6105 100644 --- a/web/app/views/clients/_session.html.erb +++ b/web/app/views/clients/_session.html.erb @@ -137,7 +137,7 @@ <%= render "addNewGear" %> <%= render "error" %> <%= render "sessionSettings" %> -<%= render :partial => "shareDialog" %> +<%= render :partial => "shareSessionDialog" %>