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

changed the delete to a destroy on retraction, also removed a puts

Browse source
This commit is contained in:
zhitomirskiyi 2011-02-23 12:00:42 -08:00
parent 16e8ecc72c
commit 97e00f9ee3
3 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/post.rb
View file

@ -23,7 +23,7 @@ class Post < ActiveRecord::Base
cattr_reader :per_page cattr_reader :per_page
@@per_page = 10 @@per_page = 10
before_destroy :propogate_retraction after_destroy :propogate_retraction
def user_refs def user_refs
self.post_visibilities.count self.post_visibilities.count

2
app/models/retraction.rb
View file

@ -42,7 +42,7 @@ class Retraction
def perform receiving_user def perform receiving_user
Rails.logger.debug "Performing retraction for #{post_guid}" Rails.logger.debug "Performing retraction for #{post_guid}"
self.target.unsocket_from_user receiving_user if target.respond_to? :unsocket_from_user self.target.unsocket_from_user receiving_user if target.respond_to? :unsocket_from_user
self.target.delete self.target.destroy
target.post_visibilities.delete_all target.post_visibilities.delete_all
Rails.logger.info("event=retraction status=complete type=#{self.type} guid=#{self.post_guid}") Rails.logger.info("event=retraction status=complete type=#{self.type} guid=#{self.post_guid}")
end end

1
spec/helpers/application_helper_spec.rb
View file

@ -121,7 +121,6 @@ describe ApplicationHelper do
start_url ="http://www.youtube.com/watch?v=" + video_id start_url ="http://www.youtube.com/watch?v=" + video_id
url = start_url + "&a=GxdCwVVULXdvEBKmx_f5ywvZ0zZHHHDU&list=ML&playnext=1" url = start_url + "&a=GxdCwVVULXdvEBKmx_f5ywvZ0zZHHHDU&list=ML&playnext=1"
res = markdownify(url) res = markdownify(url)
pp res
res.match(/href="<a/).should be_nil res.match(/href="<a/).should be_nil
end end
end end