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-546 use session settings to preselect band on create session

This commit is contained in:
Brian Smith 2014-02-17 22:00:57 -05:00
parent 5a4a097539
commit e535d0401d
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pb/src/client_container.proto
View File

@ -121,6 +121,7 @@ message ClientMessage {
// band notifications
optional BandInvitation band_invitation = 225;
optional BandInvitationAccepted band_invitation_accepted = 230;
optional BandSessionJoin band_session_join = 235;
optional MusicianSessionFresh musician_session_fresh = 240;
optional MusicianSessionStale musician_session_stale = 245;
@ -302,14 +303,6 @@ message MusicianSessionJoin {
optional string created_at = 5;
}
message BandSessionJoin {
optional string session_id = 1;
optional string photo_url = 2;
optional string msg = 3;
optional string notification_id = 4;
optional string created_at = 5;
}
message MusicianRecordingSaved {
optional string recording_id = 1;
optional string photo_url = 2;
@ -365,6 +358,14 @@ message BandInvitationAccepted {
optional string created_at = 5;
}
message BandSessionJoin {
optional string session_id = 1;
optional string photo_url = 2;
optional string msg = 3;
optional string notification_id = 4;
optional string created_at = 5;
}
// route_to: client:
// sent by server to let the rest of the participants know a client has become active again after going stale
message MusicianSessionFresh {

3
web/app/assets/javascripts/createSession.js.erb
View File

@ -44,6 +44,9 @@
$('#musician-access-option-' + approval_required).iCheck('check').attr('checked', 'checked');
}
var bandId = sessionSettings.hasOwnProperty('band_id') ? sessionSettings.band_id : '';
$('#band-list', $form).val(bandId);
var fan_access = sessionSettings.hasOwnProperty('fan_access') ? sessionSettings.fan_access : true;
$('#fan-access option[value=' + fan_access + ']').attr('selected', 'selected');
toggleFanAccess();