Merge pull request #3675 from AlchemyCMS/set-public-until-on-public-false

Set `public_until` instead of clearing `public_on` when unpublishing elements

Author: tvdeyen

app/models/alchemy/element.rb

@@ -234,9 +234,10 @@ def store_page(page)
     def public=(value)
       @public_on_explicitely_set = true
       if ActiveModel::Type::Boolean.new.cast(value)
-        self.public_on ||= Time.current
+        self.public_on = Time.current
+        self.public_until = nil
       else
-        self.public_on = nil
+        self.public_until = Time.current
       end
     end
 

spec/models/alchemy/page/publisher_spec.rb

@@ -28,7 +28,7 @@
     shared_context "with elements" do
       let(:page) do
         create(:alchemy_page, autogenerate_elements: true).tap do |page|
-          page.draft_version.elements.first.update!(public: false)
+          page.draft_version.elements.first.update!(public_until: 1.minute.ago)
         end
       end
     end