resolved issue regarding profile images referenced at https:// locations.
This commit is contained in:
parent
6eb50ea934
commit
7acc138a21
2 changed files with 18 additions and 3 deletions
|
|
@ -73,12 +73,12 @@ class PeopleController < ApplicationController
|
||||||
private
|
private
|
||||||
def prep_image_url(params)
|
def prep_image_url(params)
|
||||||
if params[:profile] && params[:profile][:image_url]
|
if params[:profile] && params[:profile][:image_url]
|
||||||
url = APP_CONFIG[:pod_url].dup
|
|
||||||
url.chop! if APP_CONFIG[:pod_url][-1,1] == '/'
|
|
||||||
if params[:profile][:image_url].empty?
|
if params[:profile][:image_url].empty?
|
||||||
params[:profile].delete(:image_url)
|
params[:profile].delete(:image_url)
|
||||||
else
|
else
|
||||||
if /^http:\/\// =~ params[:profile][:image_url]
|
url = APP_CONFIG[:pod_url].dup
|
||||||
|
url.chop! if APP_CONFIG[:pod_url][-1,1] == '/'
|
||||||
|
if params[:profile][:image_url].match(/^https?:\/\//)
|
||||||
params[:profile][:image_url] = params[:profile][:image_url]
|
params[:profile][:image_url] = params[:profile][:image_url]
|
||||||
else
|
else
|
||||||
params[:profile][:image_url] = url + params[:profile][:image_url]
|
params[:profile][:image_url] = url + params[:profile][:image_url]
|
||||||
|
|
|
||||||
|
|
@ -46,8 +46,23 @@ describe PeopleController do
|
||||||
image_url = user.person.profile.image_url
|
image_url = user.person.profile.image_url
|
||||||
put("update", :id => user.person.id, "person" => params)
|
put("update", :id => user.person.id, "person" => params)
|
||||||
|
|
||||||
|
user.person.reload
|
||||||
user.person.profile.image_url.should == image_url
|
user.person.profile.image_url.should == image_url
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it "doesn't prepend (https?://) if already present in image_url" do
|
||||||
|
params = {:profile=>
|
||||||
|
{:image_url => "https://google.com/image.png",
|
||||||
|
:last_name => user.person.profile.last_name,
|
||||||
|
:first_name => user.person.profile.first_name}}
|
||||||
|
|
||||||
|
put("update", :id => user.person.id, "person" => params)
|
||||||
|
|
||||||
|
user.person.reload
|
||||||
|
user.person.profile.image_url.should == params[:profile][:image_url]
|
||||||
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue