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

fixes #1109

Browse Source
This commit is contained in:
albert
2013-03-26 20:57:45 -04:00
parent fac215141d
commit 717872272a
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/pool.rb
View File

@@ -141,6 +141,7 @@ class Pool < ActiveRecord::Base
def add!(post) def add!(post)
return if contains?(post.id) return if contains?(post.id)
return if is_deleted?
update_attributes(:post_ids => add_number_to_string(post.id, post_ids), :post_count => post_count + 1) update_attributes(:post_ids => add_number_to_string(post.id, post_ids), :post_count => post_count + 1)
post.add_pool!(self) post.add_pool!(self)
@@ -149,6 +150,7 @@ class Pool < ActiveRecord::Base
def remove!(post) def remove!(post)
return unless contains?(post.id) return unless contains?(post.id)
return if is_deleted?
update_attributes(:post_ids => remove_number_from_string(post.id, post_ids), :post_count => post_count - 1) update_attributes(:post_ids => remove_number_from_string(post.id, post_ids), :post_count => post_count - 1)
post.remove_pool!(self) post.remove_pool!(self)

2
app/models/post.rb
View File

@@ -553,6 +553,7 @@ class Post < ActiveRecord::Base
def add_pool!(pool) def add_pool!(pool)
return if belongs_to_pool?(pool) return if belongs_to_pool?(pool)
return if pool.is_deleted?
self.pool_string = "#{pool_string} pool:#{pool.id}".strip self.pool_string = "#{pool_string} pool:#{pool.id}".strip
update_column(:pool_string, pool_string) unless new_record? update_column(:pool_string, pool_string) unless new_record?
pool.add!(self) pool.add!(self)
@@ -560,6 +561,7 @@ class Post < ActiveRecord::Base
def remove_pool!(pool) def remove_pool!(pool)
return unless belongs_to_pool?(pool) return unless belongs_to_pool?(pool)
return if pool.is_deleted?
self.pool_string = pool_string.gsub(/(?:\A| )pool:#{pool.id}(?:\Z| )/, " ").strip self.pool_string = pool_string.gsub(/(?:\A| )pool:#{pool.id}(?:\Z| )/, " ").strip
update_column(:pool_string, pool_string) unless new_record? update_column(:pool_string, pool_string) unless new_record?
pool.remove!(self) pool.remove!(self)