spree_backend 4.7.0 → 4.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53af17f0ae03b42dc296d5867212669844deec1a6613c77c77d863c7160cd9ed
-  data.tar.gz: 22326cbf504f1f32d2fb8ee81cb05990d6ef2cd6a98ed68845ff5eaa7bab2b31
+  metadata.gz: 59f19e0ef61d647e5f849d61e2edfd0027d55ac89e1fea4e9990aa7782d973b3
+  data.tar.gz: 1646f1a5a5af36d79a06064eb74e04b2b39837c8415e003175fb9b5186b0cefb
 SHA512:
-  metadata.gz: 0a2adf4c4895a8de60c84755afcca683fb13edb6e304d8691dafdd8d414274c6f4f0c768e2eae214acabc7c1a2108445b918494b14f8c18188c0b2b1c099e345
-  data.tar.gz: db8d9bd704a18c8d92c6df428b01e3a508fcff455eb56d05c5c346d7feb85bd026f9e7e9518a008ce959ecf0992f0a90423ef1881835fb72d99dc3646826e9a3
+  metadata.gz: dced348669db9b22b4dc638fcf67cc331d9dd313c1bb7e89a638967bd5809ecc4c5ab65963b5578b855d40fde4c14caec673e7fcde52771bb38822cd19d02bc2
+  data.tar.gz: c22016785bc6b36dae52c31c433ef9f019ee980bca9aaab2212427e74b0e7fda46bfa941ced8545c68b1acfbe45dcf3c1e17589bda46ab3b52393a067585503b

data/Gemfile

@@ -61,7 +61,7 @@ group :development do
 end
 
 
-spree_opts = { github: 'spree/spree', branch: 'main' }
+spree_opts = { github: 'spree/spree', branch: '4-7-stable' }
 gem 'spree_core', spree_opts
 gem 'spree_api', spree_opts
 gemspec

data/app/controllers/spree/admin/products_controller.rb

@@ -10,7 +10,6 @@ module Spree
       before_action :set_product_defaults, only: :new
 
       create.before :create_before
-      create.before :fix_option_values_params_rails_7_1
       update.before :update_before
       update.before :skip_updating_status
       update.after :update_status
@@ -168,27 +167,6 @@ module Spree
         @prototype = Spree::Prototype.find(params[:product][:prototype_id])
       end
 
-      def fix_option_values_params_rails_7_1
-        raise 'Verify if the patch is still needed' if Rails::VERSION::STRING >= '7.2.0'
-
-        if Rails::VERSION::STRING >= '7.1.0'
-          # This is a rather ugly fix for an issue with Rails 7.1.0 and 7.1.1
-          # As an example, a form field with name = option_values_hash[1][] and value = 5
-          # gets parsed incorrectly and is visible via params as the following structure
-          # { 'option_values_hash[1' => { '][]' => 5 } }
-          # This patch fixes that behavior to ensure compatibility with the existing templates
-          option_values_hash_keys = params[:product].keys.select { |e| e.starts_with?('option_values_hash[') }
-          option_values_hash = {}
-          option_values_hash_keys.each do |key|
-            value = params[:product].delete(key)
-            fixed_key = key.gsub(/option_values_hash\[/, '')
-            option_values_hash[fixed_key] ||= []
-            option_values_hash[fixed_key] << value['][]']
-          end
-          params[:product][:option_values_hash] = option_values_hash if option_values_hash.present?
-        end
-      end
-
       def update_before
         # NOTE: we only reset the product properties if we're receiving a post
         #       from the form on that tab

data/app/views/spree/admin/prototypes/show.html.erb

@@ -13,7 +13,7 @@
             <% ot.option_values.each do |ov| %>
               <li>
                 <%= label_tag "option_value_#{ov.id}" do %>
-                  <%= check_box_tag "product[option_values_hash[#{ot.id}]][]", ov.id, params[:product] && (params[:product][:option_values_hash] || {}).values.flatten.include?(ov.id.to_s), id: "option_value_#{ov.id}", class: "option-value" %>
+                  <%= check_box_tag "product[option_values_hash][#{ot.id}][]", ov.id, params[:product] && (params[:product][:option_values_hash] || {}).values.flatten.include?(ov.id.to_s), id: "option_value_#{ov.id}", class: "option-value" %>
                   <div class="option-value__color" style="--presentation: <%= ov.presentation %>"></div>
                 <% end %>
               </li>
@@ -23,7 +23,7 @@
           <ul class="option-type-values">
             <% ot.option_values.each do |ov| %>
               <li>
-                <%= check_box_tag "product[option_values_hash[#{ot.id}]][]", ov.id, params[:product] && (params[:product][:option_values_hash] || {}).values.flatten.include?(ov.id.to_s), id: "option_value_#{ov.id}", class: "option-value" %>
+                <%= check_box_tag "product[option_values_hash][#{ot.id}][]", ov.id, params[:product] && (params[:product][:option_values_hash] || {}).values.flatten.include?(ov.id.to_s), id: "option_value_#{ov.id}", class: "option-value" %>
                 <%= label_tag "option_value_#{ov.id}", ov.presentation %>
               </li>
             <% end %>

data/lib/spree/backend/version.rb

@@ -1,6 +1,6 @@
 module Spree
   module Backend
-    VERSION = '4.7.0'.freeze
+    VERSION = '4.7.1'.freeze
 
     def self.version
       VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 4.7.0
+  version: 4.7.1
 platform: ruby
 authors:
 - Sean Schofield
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-09 00:00:00.000000000 Z
+date: 2023-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -2446,9 +2446,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree_backend/issues
-  changelog_uri: https://github.com/spree/spree_backend/releases/tag/v4.7.0
+  changelog_uri: https://github.com/spree/spree_backend/releases/tag/v4.7.1
   documentation_uri: https://dev-docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree_backend/tree/v4.7.0
+  source_code_uri: https://github.com/spree/spree_backend/tree/v4.7.1
 post_install_message:
 rdoc_options: []
 require_paths: