nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix for photo urls before they are processed

Browse source
This commit is contained in:
maxwell 2011-03-18 19:00:24 -07:00
parent 5aa969559c
commit 8f9f24f383
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/photo.rb
View file

@ -70,7 +70,7 @@ class Photo < Post
end end
def url(name = nil) def url(name = nil)
if self.not_processed? || self.image.path.include? '.gif' if self.not_processed? || (!self.image.path.blank? && self.image.path.include?('.gif'))
image.url image.url
elsif remote_photo_path elsif remote_photo_path
name = name.to_s + '_' if name name = name.to_s + '_' if name

2
spec/models/photo_spec.rb
View file

@ -14,7 +14,9 @@ describe Photo do
@fail_fixture_name = File.join(File.dirname(__FILE__), '..', 'fixtures', 'msg.xml') @fail_fixture_name = File.join(File.dirname(__FILE__), '..', 'fixtures', 'msg.xml')
@photo = @user.build_post(:photo, :user_file=> File.open(@fixture_name), :to => @aspect.id) @photo = @user.build_post(:photo, :user_file=> File.open(@fixture_name), :to => @aspect.id)
@photo.processed = true
@photo2 = @user.build_post(:photo, :user_file=> File.open(@fixture_name), :to => @aspect.id) @photo2 = @user.build_post(:photo, :user_file=> File.open(@fixture_name), :to => @aspect.id)
@photo2.processed = true
end end
describe "protected attributes" do describe "protected attributes" do