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

Merge branch 'master' into vrfs-646

This commit is contained in:
Jonathon Wilson 2013-09-09 20:07:36 -06:00
parent 139e74df36 af696e308a
commit e1e91e3b1b
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/configureTrack.js
View File

@ -768,7 +768,7 @@
var $option1 = $('#voice-chat-type > option[value="1"]');
// remove Session Audio option from voice chat if none are available and not already assigned
if (unusedAudioOutputs.length === 0 && chatAssignedList.length === 0) {
if (inputUnassignedList.length === 0 && chatAssignedList.length === 0) {
logger.debug("Removing Option 1 from Voice Chat dropdown.");
$option1.remove();
}

8
app/controllers/sessions_controller.rb
View File

@ -73,15 +73,17 @@ class SessionsController < ApplicationController
end
auth_hash = request.env['omniauth.auth']
authorization = UserAuthorization.find_by_provider_and_uid(auth_hash["provider"], auth_hash["uid"])
#authorization = UserAuthorization.find_by_provider_and_uid(auth_hash["provider"], auth_hash["uid"])
if authorization.nil?
# Always make and save a new authorization. This is because they expire, and honestly there's no cost
# to just making and saving it.
#if authorization.nil?
authorization = current_user.user_authorizations.build :provider => auth_hash[:provider],
:uid => auth_hash[:uid],
:token => auth_hash[:credentials][:token],
:token_expiration => Time.at(auth_hash[:credentials][:expires_at])
authorization.save
end
#end
render 'oauth_complete', :layout => "landing"
end