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

Reorganize Post callbacks into calling order.

Browse Source 
Reorder callbacks into the same order Rails runs them in:

* before_validation
* validate
* before_save
* before_create
* after_create
* after_save
* after_commit

This doesn't change the behavior of anything, it simply rearranges
callbacks so their running order is less confusing.
This commit is contained in:
evazion
2016-10-21 01:11:11 -05:00
parent 0b7cd71d42
commit 899f008c1d
1 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
app/models/post.rb
View File

@@ -7,27 +7,31 @@ class Post < ActiveRecord::Base
class RevertError < Exception ; end class RevertError < Exception ; end
class SearchError < Exception ; end class SearchError < Exception ; end
attr_accessor :old_tag_string, :old_parent_id, :old_source, :old_rating, :has_constraints, :disable_versioning, :view_count before_validation :strip_source
after_destroy :remove_iqdb_async before_validation :initialize_uploader, :on => :create
after_destroy :delete_files before_validation :parse_pixiv_id
after_destroy :delete_remote_files before_validation :blank_out_nonexistent_parents
after_save :create_version before_validation :remove_parent_loops
after_save :update_parent_on_save validates_uniqueness_of :md5
after_save :apply_post_metatags validates_inclusion_of :rating, in: %w(s q e), message: "rating must be s, q, or e"
after_save :expire_essential_tag_string_cache validate :post_is_not_its_own_parent
after_create :update_iqdb_async validate :updater_can_change_rating
after_commit :notify_pubsub
before_save :merge_old_changes before_save :merge_old_changes
before_save :normalize_tags before_save :normalize_tags
before_save :update_tag_post_counts before_save :update_tag_post_counts
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
before_validation :strip_source after_create :update_iqdb_async
before_validation :initialize_uploader, :on => :create after_save :create_version
before_validation :parse_pixiv_id after_save :update_parent_on_save
before_validation :blank_out_nonexistent_parents after_save :apply_post_metatags
before_validation :remove_parent_loops after_save :expire_essential_tag_string_cache
after_destroy :remove_iqdb_async
after_destroy :delete_files
after_destroy :delete_remote_files
after_commit :notify_pubsub
belongs_to :updater, :class_name => "User" belongs_to :updater, :class_name => "User"
belongs_to :approver, :class_name => "User" belongs_to :approver, :class_name => "User"
belongs_to :uploader, :class_name => "User" belongs_to :uploader, :class_name => "User"
@@ -44,13 +48,10 @@ class Post < ActiveRecord::Base
has_many :children, lambda {order("posts.id")}, :class_name => "Post", :foreign_key => "parent_id" has_many :children, lambda {order("posts.id")}, :class_name => "Post", :foreign_key => "parent_id"
has_many :disapprovals, :class_name => "PostDisapproval", :dependent => :destroy has_many :disapprovals, :class_name => "PostDisapproval", :dependent => :destroy
has_many :favorites, :dependent => :destroy has_many :favorites, :dependent => :destroy
validates_uniqueness_of :md5
validates_inclusion_of :rating, in: %w(s q e), message: "rating must be s, q, or e"
validate :post_is_not_its_own_parent
validate :updater_can_change_rating
attr_accessible :source, :rating, :tag_string, :old_tag_string, :old_parent_id, :old_source, :old_rating, :parent_id, :has_embedded_notes, :as => [:member, :builder, :gold, :platinum, :janitor, :moderator, :admin, :default] attr_accessible :source, :rating, :tag_string, :old_tag_string, :old_parent_id, :old_source, :old_rating, :parent_id, :has_embedded_notes, :as => [:member, :builder, :gold, :platinum, :janitor, :moderator, :admin, :default]
attr_accessible :is_rating_locked, :is_note_locked, :as => [:builder, :janitor, :moderator, :admin] attr_accessible :is_rating_locked, :is_note_locked, :as => [:builder, :janitor, :moderator, :admin]
attr_accessible :is_status_locked, :as => [:admin] attr_accessible :is_status_locked, :as => [:admin]
attr_accessor :old_tag_string, :old_parent_id, :old_source, :old_rating, :has_constraints, :disable_versioning, :view_count
module FileMethods module FileMethods
def distribute_files def distribute_files