jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixes #2016

Browse Source
This commit is contained in:
Toks
2013-10-26 14:02:52 -04:00
parent ff989e19cc
commit d0e9d4519a
4 changed files with 49 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/models/post.rb
View File

@@ -629,17 +629,17 @@ class Post < ActiveRecord::Base
pool_string =~ /(?:\A| )pool:#{pool_id}(?:\Z| )/
end
def add_pool!(pool)
def add_pool!(pool, force = false)
return if belongs_to_pool?(pool)
return if pool.is_deleted?
return if pool.is_deleted? && !force
self.pool_string = "#{pool_string} pool:#{pool.id}".strip
update_column(:pool_string, pool_string) unless new_record?
pool.add!(self)
end
def remove_pool!(pool)
def remove_pool!(pool, force = false)
return unless belongs_to_pool?(pool)
return if pool.is_deleted?
return if pool.is_deleted? && !force
self.pool_string = pool_string.gsub(/(?:\A| )pool:#{pool.id}(?:\Z| )/, " ").strip
update_column(:pool_string, pool_string) unless new_record?
pool.remove!(self)