Skip to content

multiple drafts support #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
yasser-sobhy wants to merge 2 commits into from
Closed

multiple drafts support #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8dba41
prepare for version 1, remove deprecated methods and callbacks
yasser-sobhy May 29, 2017
96760bf
support multiple drafts
yasser-sobhy May 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 6 additions & 17 deletions lib/draftsman/draft.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
class Draftsman::Draft < ActiveRecord::Base
# Associations
belongs_to :item, polymorphic: true
belongs_to :item, polymorphic: true, counter_cache: true

# Validations
validates :event, presence: true
Expand Down Expand Up @@ -62,12 +62,7 @@ def destroy?
def draft_publication_dependencies
dependencies = []

my_item =
if Draftsman.stash_drafted_changes? && self.item.draft?
self.item.draft.reify
else
self.item
end
my_item = self.item

case self.event.to_sym
when :create, :update
Expand Down Expand Up @@ -169,17 +164,14 @@ def publish!
case self.event.to_sym
when :create, :update
# Parents must be published too
self.draft_publication_dependencies.each { |dependency| dependency.publish! }
#self.draft_publication_dependencies.each { |dependency| dependency.publish! }

# Update drafts need to copy over data to main record
self.item.attributes = self.reify.attributes if Draftsman.stash_drafted_changes? && self.update?

# Write `published_at` attribute
self.item.send("#{self.item.class.published_at_attribute_name}=", Time.now)

# Clear out draft
self.item.send("#{self.item.class.draft_association_name}_id=", nil)

# Determine which columns should be updated
only = self.item.class.draftsman_options[:only]
ignore = self.item.class.draftsman_options[:ignore]
Expand Down Expand Up @@ -207,7 +199,7 @@ def publish!
#
# Example usage:
#
# `@category = @category.draft.reify if @category.draft?`
# `@category = @category.drafts.last.reify if @category.has_drafts?`
def reify
# This appears to be necessary if for some reason the draft's model
# hasn't been loaded (such as when done in the console).
Expand All @@ -233,7 +225,6 @@ def reify
end
end

self.item.send("#{self.item.class.draft_association_name}=", self)
self.item
# Reify based on object if it's all that's available.
elsif self.object.present?
Expand All @@ -249,7 +240,7 @@ def reify
end
end

self.item.send("#{self.item.class.draft_association_name}=", self)
#self.item.send("#{self.item.class.draft_association_name}=", self)
self.item
end
end
Expand All @@ -275,14 +266,12 @@ def revert!
self.item.send("#{attr}=", values.first) if self.item.respond_to?(attr)
end
end
# Then clear out the draft ID.
self.item.send("#{self.item.class.draft_association_name}_id=", nil)
self.item.save!(validate: false)
# Then destroy draft.
self.destroy
when :destroy
# Parents must be restored too
self.draft_reversion_dependencies.each { |dependency| dependency.revert! }
#self.draft_reversion_dependencies.each { |dependency| dependency.revert! }

# Restore previous draft if one was stashed away
if self.previous_draft.present?
Expand Down
Loading