alchemy_cms 4.4.2 → 4.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae4ec24167d52bce7dd695bff45480caea2bdc319b2ade53f0ce1e1765c8f2ec
-  data.tar.gz: fea9390ea760a741269c9115c41090bfd0052705bbb161cb110295a390f84343
+  metadata.gz: 9af617bbf653eb9e5c293217f9dfc90060aaa22da0b306f0320c4da5858fbb9c
+  data.tar.gz: 405d140847ff533931bc8e759fc2cd1ae934ca0c856fe4e27cf346426f950867
 SHA512:
-  metadata.gz: 5e2b632ebbc2222d6664d0b9e315d978df3840968e90570da00f89226427aa21465ac7fb17f350a21e976f928a84ec32b6476c4cd769791fdfc7ad774456c32b
-  data.tar.gz: 74f98bf1fdf3301ae10af181414c49819945ba10b41abf5a0f993fb00606aa866e7fd4ae1c8a15b1808e2e3734e94d5954a889836f043f66d77ace3e71d1f395
+  metadata.gz: af4468b1a30d64e3ddbaad1aaeacd20f65b417651a23768ee6196348d9a9f0bb34734a9800fc5d236dc88e6ab4e6f50ba0e40c7baea490de5d97383b501bfdca
+  data.tar.gz: 88f2e7796ef2bd46b9cde670f0acd6f14e664bea97bc0170c607258c62cfd114aa8474754e7f5223e86b86cd58c09b1a9c9fc27da3aa118b90b60fb85d3a8cf4

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## 5.0.0 (unreleased)
 
+## 4.4.3 (2020-02-26)
+
+- Scope nodes to sites [#1738](https://github.com/AlchemyCMS/alchemy_cms/pull/1738) ([tvdeyen](https://github.com/tvdeyen))
+
 ## 4.4.2 (2020-02-25)
 
 - Do not use deprecated methods [#1737](https://github.com/AlchemyCMS/alchemy_cms/pull/1737) ([tvdeyen](https://github.com/tvdeyen))

data/app/controllers/alchemy/admin/nodes_controller.rb

@@ -9,6 +9,7 @@ module Alchemy
 
       def new
         @node = Node.new(
+          site: Alchemy::Site.current,
           parent_id: params[:parent_id],
           language: Language.current
         )
@@ -28,6 +29,7 @@ module Alchemy
 
       def resource_params
         params.require(:node).permit(
+          :site_id,
           :parent_id,
           :language_id,
           :page_id,

data/app/helpers/alchemy/pages_helper.rb

@@ -188,7 +188,7 @@ module Alchemy
     # @param [String] - Name of the menu
     # @param [Hash] - A set of options available in your menu partials
     def render_menu(name, options = {})
-      root_node = Alchemy::Node.roots.find_by(name: name)
+      root_node = Alchemy::Node.roots.find_by(name: name, site: Alchemy::Site.current)
       if root_node.nil?
         warning("Menu with name #{name} not found!")
         return

data/app/models/alchemy/node.rb

@@ -7,6 +7,7 @@ module Alchemy
     acts_as_nested_set scope: 'language_id', touch: true
     stampable stamper_class_name: Alchemy.user_class_name
 
+    belongs_to :site, class_name: 'Alchemy::Site'
     belongs_to :language, class_name: 'Alchemy::Language'
     belongs_to :page, class_name: 'Alchemy::Page', optional: true, inverse_of: :nodes
 

data/app/models/alchemy/page.rb

@@ -594,7 +594,10 @@ module Alchemy
     end
 
     def attach_to_menu!
-      Alchemy::Node.find(menu_id).children.create!(
+      current_site_id = Alchemy::Site.current.id
+      node = Alchemy::Node.find_by!(id: menu_id, site_id: current_site_id)
+      node.children.create!(
+        site_id: current_site_id,
         language_id: language_id,
         page_id: id,
         name: name

data/app/views/alchemy/admin/nodes/_form.html.erb

@@ -12,6 +12,7 @@
     <%= f.input :external %>
     <%= f.hidden_field :parent_id %>
   <% end %>
+  <%= f.hidden_field :site_id %>
   <%= f.hidden_field :language_id %>
   <%= f.submit button_label %>
 <% end %>

data/db/migrate/20200226081535_add_site_id_to_alchemy_nodes.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class AddSiteIdToAlchemyNodes < ActiveRecord::Migration[5.0]
+  def change
+    add_column :alchemy_nodes, :site_id, :integer, index: true
+    add_index :alchemy_nodes, :site_id
+    reversible do |dir|
+      dir.up do
+        Alchemy::Node.update_all(site_id: Alchemy::Site.first&.id)
+        change_column_null :alchemy_nodes, :site_id, false
+      end
+    end
+    add_foreign_key :alchemy_nodes, :alchemy_sites, column: :site_id, on_delete: :cascade
+  end
+end

data/lib/alchemy/test_support/factories/node_factory.rb

@@ -6,6 +6,7 @@ require 'alchemy/test_support/factories/page_factory'
 
 FactoryBot.define do
   factory :alchemy_node, class: 'Alchemy::Node' do
+    site { Alchemy::Site.default }
     language { Alchemy::Language.default }
     name { 'A Node' }
 

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "4.4.2"
+  VERSION = "4.4.3"
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 4.4.2
+  version: 4.4.3
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-25 00:00:00.000000000 Z
+date: 2020-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -1024,6 +1024,7 @@ files:
 - db/migrate/20180519204655_add_fixed_to_alchemy_elements.rb
 - db/migrate/20191016073858_create_alchemy_essence_pages.rb
 - db/migrate/20191029212236_create_alchemy_nodes.rb
+- db/migrate/20200226081535_add_site_id_to_alchemy_nodes.rb
 - lib/alchemy/ability_helper.rb
 - lib/alchemy/admin/locale.rb
 - lib/alchemy/auth_accessors.rb