alchemy_cms 4.3.0 → 4.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6793e9729b0c34e11be7a3e2d3f7ff0349487160e4475dd996f7f9f7fcb934e2
-  data.tar.gz: ce5abeb95c686969111f5416119044f48e4b14567a06c304c273834b23bf7ebb
+  metadata.gz: c67729c6c534a44e06fc02b82c53a64ff9cafab4433533dc1592df5e59579541
+  data.tar.gz: fe7e077d42fae25e4d12f428c1a734feeaae75338cd43c2b88d2fb49f214de6b
 SHA512:
-  metadata.gz: 3b491617ba28d0076d0a9dfbfac6eccc4dcd6d10e10d50a3491b5b5c24c3a46e0ede45ce7541e59fc6be118a6833ba89c73db39c885e454892d0e5509215c134
-  data.tar.gz: 2707ac47411012a25a279fdd9fefeffdaffa1109f17870468d9995d5291c35e96ed4103f457986ba3dbccf23f6f8aba34ebe5476ca9d166ca5c4dd357b6c1065
+  metadata.gz: 91d8208ee014e33ab41aad7f4f037f8a614ac0e5ade40483d557f23ba6a190db4c17ea1e60c270731532ffd81224b695e151725edea3c0317bf453ee06ab990c
+  data.tar.gz: cd476220daa7ba64f0c14ebd350deb973754f35203f91e13dd9bfcf94d4291a68bd609be42de0095cbd19424adfa978f7738c47fea9e9a25e2fe87740603254d

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 4.3.1 (2019-09-27)
+
+- Fix Cell Migration to maintain positions [#1625](https://github.com/AlchemyCMS/alchemy_cms/pull/1625) ([mamhoff](https://github.com/mamhoff))
+- Cell Upgrader: Match quotation marks in cell name string [#1624](https://github.com/AlchemyCMS/alchemy_cms/pull/1624) ([mamhoff](https://github.com/mamhoff))
+- Cell Migrator: Maintain element order in fixed elements [#1623](https://github.com/AlchemyCMS/alchemy_cms/pull/1623) ([mamhoff](https://github.com/mamhoff))
+- Enhance cells upgrader to deal with render_elements from_page: x [#1622](https://github.com/AlchemyCMS/alchemy_cms/pull/1622) ([mamhoff](https://github.com/mamhoff))
+
 # 4.3.0 (2019-08-23)
 
 - Add Rails 6 support [#1616](https://github.com/AlchemyCMS/alchemy_cms/pull/1616) ([tvdeyen](https://github.com/tvdeyen))
@@ -11,6 +18,13 @@
 - Only return visible elements from Pages elements relations [#1590](https://github.com/AlchemyCMS/alchemy_cms/pull/1590) ([tvdeyen](https://github.com/tvdeyen))
 - Only return visible elements from Elements nested_elements relation [#1589](https://github.com/AlchemyCMS/alchemy_cms/pull/1589) ([tvdeyen](https://github.com/tvdeyen))
 
+## 4.2.3 (2019-09-27)
+
+- Fix Cell Migration to maintain positions [#1625](https://github.com/AlchemyCMS/alchemy_cms/pull/1625) ([mamhoff](https://github.com/mamhoff))
+- Cell Upgrader: Match quotation marks in cell name string [#1624](https://github.com/AlchemyCMS/alchemy_cms/pull/1624) ([mamhoff](https://github.com/mamhoff))
+- Cell Migrator: Maintain element order in fixed elements [#1623](https://github.com/AlchemyCMS/alchemy_cms/pull/1623) ([mamhoff](https://github.com/mamhoff))
+- Enhance cells upgrader to deal with render_elements from_page: x [#1622](https://github.com/AlchemyCMS/alchemy_cms/pull/1622) ([mamhoff](https://github.com/mamhoff))
+
 ## 4.2.2 (2019-08-13)
 
 - Fallback to default locale if unavailable locale requested  [#1610](https://github.com/AlchemyCMS/alchemy_cms/pull/1610) ([mamhoff](https://github.com/mamhoff))

data/lib/alchemy/upgrader/tasks/cells_migration.rb

@@ -27,11 +27,13 @@ module Alchemy::Upgrader::Tasks
       # bust element definitions insta cache
       Alchemy::Element.instance_variable_set('@definitions', nil)
       fixed_element = Alchemy::Element.find_or_initialize_by(fixed: true, name: cell.name, page: cell.page)
-      elements = Alchemy::Element.where(cell_id: cell.id)
+      elements = Alchemy::Element.where(cell_id: cell.id).order(position: :asc)
 
       if fixed_element.new_record?
-        fixed_element.nested_elements = elements
         fixed_element.save!
+        Alchemy::Element.acts_as_list_no_update do
+          elements.update_all(parent_element_id: fixed_element.id)
+        end
         puts "Created new fixed element '#{fixed_element.name}' for cell '#{cell.name}'."
       else
         puts "Element for cell '#{cell.name}' already present. Skip"

data/lib/alchemy/upgrader/tasks/cells_upgrader.rb

@@ -129,6 +129,7 @@ module Alchemy::Upgrader::Tasks
       Dir.glob("#{alchemy_views_folder}/**/*").each do |view|
         next if File.directory?(view)
         gsub_file(view, /render_cell[\(\s]?([:'"]?[a-z_]+['"]?)\)?/, 'render_elements(only: \1, fixed: true)')
+        gsub_file(view, /render_elements[\(\s](.*):?from_cell:?\s?(=>)?\s?(['"][a-z_]+['"])\)?/, 'render_elements(\1only: \3, fixed: true)')
       end
     end
 

data/lib/alchemy/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.3.1
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-23 00:00:00.000000000 Z
+date: 2019-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers