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-4721 - Links in lesson chat should not require you to log in when external browser shows

This commit is contained in:
Seth Call 2018-03-10 07:56:56 -06:00
parent 6e8e509108
commit efe1ee5d7d
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
web/app/assets/javascripts/react-components/ChatWindow.js.jsx.coffee
View File

@ -52,13 +52,23 @@ SessionStore = @SessionStore
notationClicked: (music_notation, e) -> notationClicked: (music_notation, e) ->
e.preventDefault() e.preventDefault()
context.JK.popExternalLink("/api/music_notations/#{music_notation.id}?target=_blank") rest.getMusicNotation(music_notation.id).done((response) =>
context.JK.popExternalLink(response.url)
)
.fail((jqXHR) =>
context.JK.Banner.showAlert('Unable to fetch URL for music notation. Error: ' + jqXHR.responseText)
)
audioClicked: (music_notation, e) -> audioClicked: (music_notation, e) ->
e.preventDefault() e.preventDefault()
context.JK.popExternalLink("/api/music_notations/#{music_notation.id}?target=_blank") rest.getMusicNotation(music_notation.id).done((response) =>
context.JK.popExternalLink(response.url)
)
.fail((jqXHR) =>
context.JK.Banner.showAlert('Unable to fetch URL for audio. Error: ' + jqXHR.responseText)
)
recordingClicked: (recording, e) -> recordingClicked: (recording, e) ->
e.preventDefault() e.preventDefault()
context.JK.popExternalLink("/recordings/#{recording.id}") context.JK.popExternalLink("/recordings/#{recording.id}")

2
web/app/controllers/api_music_notations_controller.rb
View File

@ -72,7 +72,7 @@ class ApiMusicNotationsController < ApiController
if '_blank'==params[:target] if '_blank'==params[:target]
redirect_to @music_notation.sign_url redirect_to @music_notation.sign_url
else else
render :text => @music_notation.sign_url render :json => {url: @music_notation.sign_url}
end end
end end