From 149967f87748cd932c5d82f218fbe71d2bd52fe8 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Wed, 29 Oct 2014 10:27:29 -0500 Subject: [PATCH] * VRFS-2375 - share button works now in master mix complete msg --- pb/src/client_container.proto | 1 + ruby/lib/jam_ruby/message_factory.rb | 3 ++- ruby/lib/jam_ruby/models/notification.rb | 1 + web/app/assets/javascripts/notificationPanel.js | 7 +++++-- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pb/src/client_container.proto b/pb/src/client_container.proto index b9a7aeba0..5515757d9 100644 --- a/pb/src/client_container.proto +++ b/pb/src/client_container.proto @@ -481,6 +481,7 @@ message RecordingMasterMixComplete { optional string msg = 3; optional string notification_id = 4; optional string created_at = 5; + optional string claimed_recording_id = 6; } message DownloadAvailable { diff --git a/ruby/lib/jam_ruby/message_factory.rb b/ruby/lib/jam_ruby/message_factory.rb index 7ece76e28..f5666089a 100644 --- a/ruby/lib/jam_ruby/message_factory.rb +++ b/ruby/lib/jam_ruby/message_factory.rb @@ -712,9 +712,10 @@ module JamRuby ) end - def recording_master_mix_complete(receiver_id, recording_id, band_id, msg, notification_id, created_at) + def recording_master_mix_complete(receiver_id, recording_id, claimed_recording_id, band_id, msg, notification_id, created_at) recording_master_mix_complete = Jampb::RecordingMasterMixComplete.new( :recording_id => recording_id, + :claimed_recording_id => claimed_recording_id, :band_id => band_id, :msg => msg, :notification_id => notification_id, diff --git a/ruby/lib/jam_ruby/models/notification.rb b/ruby/lib/jam_ruby/models/notification.rb index 77b2c2394..adb481c81 100644 --- a/ruby/lib/jam_ruby/models/notification.rb +++ b/ruby/lib/jam_ruby/models/notification.rb @@ -1147,6 +1147,7 @@ module JamRuby msg = @@message_factory.recording_master_mix_complete( claimed_recording.user_id, recording.id, + claimed_recording.id, notification.band_id, notification_msg, notification.id, diff --git a/web/app/assets/javascripts/notificationPanel.js b/web/app/assets/javascripts/notificationPanel.js index 1e56483f3..e91e049b8 100644 --- a/web/app/assets/javascripts/notificationPanel.js +++ b/web/app/assets/javascripts/notificationPanel.js @@ -25,6 +25,7 @@ var notificationBatchSize = 20; var currentNotificationPage = 0; var didLoadAllNotifications = false, isLoading = false; + var ui = new context.JK.UIHelper(JK.app); function isNotificationsPanelVisible() { return $contents.is(':visible') @@ -1101,7 +1102,7 @@ "class": "button-orange", callback: shareRecording, callback_args: { - "recording_id": payload.recording_id + "claimed_recording_id": payload.claimed_recording_id } }] ); @@ -1109,7 +1110,9 @@ } function shareRecording(args) { - var recordingId = args.recording_id; + var claimedRecordingId = args.claimed_recording_id; + + ui.launchShareDialog(claimedRecordingId, 'recording'); } function registerBandInvitation() {