Skip to content

Commit

Permalink
Allow incoming link to be a URI (call to_s on it)
Browse files Browse the repository at this point in the history
This advances support for rails 5+.
  • Loading branch information
atz committed Sep 9, 2016
1 parent 8299bed commit ac1d101
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions app/controllers/browse_everything_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,30 @@ class BrowseEverythingController < ActionController::Base
helper BrowseEverythingHelper

after_filter {session["#{provider_name}_token"] = provider.token unless provider.nil? }

def index
render :layout => !request.xhr?
end

def show
render :layout => !request.xhr?
end

def auth
code = params[:code]
session["#{provider_name}_token"] = provider.connect(params,session["#{provider_name}_data"])
end

def resolve
selected_files = params[:selected_files] || []
@links = selected_files.collect { |file|
p,f = file.split(/:/)
@links = selected_files.collect { |file|
p,f = file.split(/:/)
(url,extra) = browser.providers[p].link_for(f)
result = { url: url }
result.merge!(extra) unless extra.nil?
result
}
respond_to do |format|
respond_to do |format|
format.html { render :layout => false }
format.json { render :json => @links }
end
Expand All @@ -40,7 +40,7 @@ def auth_link
@auth_link ||= if provider.present?
link, data = provider.auth_link
session["#{provider_name}_data"] = data
link = "#{link}&state=#{provider.key}" unless link.include?("state")
link = "#{link}&state=#{provider.key}" unless link.to_s.include?('state')
link
else
nil
Expand Down

0 comments on commit ac1d101

Please sign in to comment.