seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

* VRFS-2375 - share button works now in master mix complete msg

This commit is contained in:
Seth Call 2014-10-29 10:27:29 -05:00
parent 28e752629a
commit 149967f877
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pb/src/client_container.proto
View File

@ -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 {

3
ruby/lib/jam_ruby/message_factory.rb
View File

@ -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,

1
ruby/lib/jam_ruby/models/notification.rb
View File

@ -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,

7
web/app/assets/javascripts/notificationPanel.js
View File

@ -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() {