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

Take error out of posting status messages with photos

Browse source
This commit is contained in:
Raphael Sofaer 2011-02-11 19:20:19 -08:00
parent 3e2c9b4b94
commit de475ec4eb
4 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/controllers/photos_controller.rb
View file

@ -57,8 +57,11 @@ class PhotosController < ApplicationController
aspects = current_user.aspects_from_ids(params[:photo][:aspect_ids]) aspects = current_user.aspects_from_ids(params[:photo][:aspect_ids])
current_user.add_to_streams(@photo, aspects)
current_user.dispatch_post(@photo, :to => params[:photo][:aspect_ids]) unless @photo.pending unless @photo.pending
current_user.add_to_streams(@photo, aspects)
current_user.dispatch_post(@photo, :to => params[:photo][:aspect_ids])
end
if params[:photo][:set_profile_photo] if params[:photo][:set_profile_photo]
profile_params = {:image_url => @photo.url(:thumb_large), profile_params = {:image_url => @photo.url(:thumb_large),

7
app/controllers/status_messages_controller.rb
View file

@ -27,11 +27,14 @@ class StatusMessagesController < ApplicationController
if !photos.empty? if !photos.empty?
@status_message.photos += photos @status_message.photos += photos
for photo in photos for photo in photos
was_pending = photo.pending
photo.public = public_flag photo.public = public_flag
photo.pending = false photo.pending = false
photo.save photo.save
current_user.add_to_streams(photo, aspects) if was_pending
current_user.dispatch_post(photo) current_user.add_to_streams(photo, aspects)
current_user.dispatch_post(photo)
end
end end
end end

6
app/models/photo.rb
View file

@ -51,7 +51,11 @@ class Photo < Post
end end
def status_message_guid def status_message_guid
self.status_message.guid if self.status_message
self.status_message.guid
else
nil
end
end end
def status_message_guid= new_sm_guid def status_message_guid= new_sm_guid

4
spec/controllers/status_messages_controller_spec.rb
View file

@ -83,8 +83,8 @@ describe StatusMessagesController do
fixture_filename = 'button.png' fixture_filename = 'button.png'
fixture_name = File.join(File.dirname(__FILE__), '..', 'fixtures', fixture_filename) fixture_name = File.join(File.dirname(__FILE__), '..', 'fixtures', fixture_filename)
@photo1 = @user1.build_post(:photo, :user_file=> File.open(fixture_name), :to => @aspect1.id) @photo1 = @user1.build_post(:photo, :pending => true, :user_file=> File.open(fixture_name), :to => @aspect1.id)
@photo2 = @user1.build_post(:photo, :user_file=> File.open(fixture_name), :to => @aspect1.id) @photo2 = @user1.build_post(:photo, :pending => true, :user_file=> File.open(fixture_name), :to => @aspect1.id)
@photo1.save! @photo1.save!
@photo2.save! @photo2.save!