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

fix #2950: don't send versions to archives if save fails.

Browse Source
This commit is contained in:
evazion
2017-04-01 03:30:00 -05:00
committed by r888888888
parent 1578c56b9d
commit 8fff3315f2
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/pool.rb
View File

@@ -17,9 +17,9 @@ class Pool < ActiveRecord::Base
before_validation :initialize_creator, :on => :create before_validation :initialize_creator, :on => :create
before_validation :strip_name before_validation :strip_name
after_save :update_category_pseudo_tags_for_posts_async after_save :update_category_pseudo_tags_for_posts_async
after_save :create_version
after_create :synchronize! after_create :synchronize!
before_destroy :create_mod_action_for_destroy before_destroy :create_mod_action_for_destroy
after_commit :create_version, :on => [:create, :update]
attr_accessible :name, :description, :post_ids, :post_id_array, :post_count, :is_active, :category, :as => [:member, :gold, :platinum, :janitor, :moderator, :admin, :default] attr_accessible :name, :description, :post_ids, :post_id_array, :post_count, :is_active, :category, :as => [:member, :gold, :platinum, :janitor, :moderator, :admin, :default]
attr_accessible :is_deleted, :as => [:moderator, :admin] attr_accessible :is_deleted, :as => [:moderator, :admin]

4
app/models/post.rb
View File

@@ -23,13 +23,13 @@ class Post < ActiveRecord::Base
before_save :set_tag_counts before_save :set_tag_counts
before_save :set_pool_category_pseudo_tags before_save :set_pool_category_pseudo_tags
before_create :autoban before_create :autoban
after_save :create_version
after_save :update_parent_on_save after_save :update_parent_on_save
after_save :apply_post_metatags after_save :apply_post_metatags
after_save :expire_essential_tag_string_cache after_save :expire_essential_tag_string_cache
after_destroy :remove_iqdb_async after_destroy :remove_iqdb_async
after_destroy :delete_files after_destroy :delete_files
after_destroy :delete_remote_files after_destroy :delete_remote_files
after_commit :create_version, :on => [:create, :update]
after_commit :update_iqdb_async, :on => :create after_commit :update_iqdb_async, :on => :create
after_commit :notify_pubsub after_commit :notify_pubsub
@@ -1414,7 +1414,7 @@ class Post < ActiveRecord::Base
module VersionMethods module VersionMethods
def create_version(force = false) def create_version(force = false)
if new_record? || rating_changed? || source_changed? || parent_id_changed? || tag_string_changed? || force if force || new_record? || previous_changes.key?("rating") || previous_changes.key?("source") || previous_changes.key?("parent_id") || previous_changes.key?("tag_string")
create_new_version create_new_version
end end
end end