solidus_backend 3.2.3 → 3.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff3b0be31692e952e9756dd6d02e2156cd328f6d8f95eeda5ef8f6d8e12e22da
-  data.tar.gz: bcfecf645946ce5324b3b8ce001a7fd7a4d38da8db3e18738e3e4cee183830f2
+  metadata.gz: c4f168ce9df9e5114355c4ae9fc5dc5da2559a339777c08e9dcb58f0cd1f0ccf
+  data.tar.gz: fbcd1ca044d19b1f7e744d96e49af4e199e4da73503784acfee55acb0320621a
 SHA512:
-  metadata.gz: 76b6ac3adcdf770abf436e0a530a94e61a0ba666eaf6f8272d7a08bb1437eddeeaefc472b5e6b099943b5fc791005c6cb67706573d01c14025040108fa4f00ba
-  data.tar.gz: 414a0910cb90706ae48f73173ec6eb7546b748b0ca2f2a5cf6dee77ee0974ece835bee35faa9d4acb46800caf31a6d9e5b380f9a785e8f7fb3e422968cd38cc4
+  metadata.gz: 83dadf2d57dacccf8bebd48ea2d33f61717d573f27ff365d0bd77c3d4dafb162888feb4dbe32439c322204a1f6d0fd9be9da26bde10f325768752fc088bba9ac
+  data.tar.gz: 5447bd0787675d46ceaaffd91ddb931a25ba86c98c476afe315bf4aeaf183506c614fb2ffcf54197893cbe9b3c15a83a5ca51af0ab494b9515527bcc4dedc784

data/app/assets/javascripts/spree/backend/models/image_upload.js

@@ -56,7 +56,7 @@ Spree.Models.ImageUpload = Backbone.Model.extend({
       processData: false,  // tell jQuery not to process the data
       contentType: false,  // tell jQuery not to set contentType
       xhr: function () {
-        var xhr = $.ajaxSetup.xhr(); // Using default ajax builder but inputting upload settings
+        var xhr = $.ajaxSettings.xhr();
         if (xhr.upload) {
           xhr.upload.onprogress = function (event) {
             if (event.lengthComputable) {

data/app/views/spree/admin/product_properties/index.html.erb

@@ -36,7 +36,7 @@
       </tbody>
     </table>
 
-    <% if can?([:create, :update], Spree::ProductProperty) %>
+    <% if can?(:create, Spree::ProductProperty) && can?(:update, Spree::ProductProperty) %>
       <%= render 'spree/admin/shared/edit_resource_links' %>
     <% end %>
 
@@ -95,7 +95,7 @@
             <% end %>
           </tbody>
         </table>
-        <% if can?([:create, :update], Spree::VariantPropertyRule) %>
+        <% if can?(:create, Spree::VariantPropertyRule) && can?(:update, Spree::VariantPropertyRule) %>
           <%= render 'spree/admin/shared/edit_resource_links' %>
         <% end %>
       </fieldset>

data/app/views/spree/admin/products/_form.html.erb

@@ -33,7 +33,7 @@
         <%= f.field_container :price do %>
           <%= f.label :price, class: Spree::Config.require_master_price ? 'required' : '' %>
 
-          <% if f.object.new_record? || f.object.has_default_price? %>
+          <% if (f.object.new_record? || f.object.has_default_price?) && !f.object.discarded? %>
             <%= render "spree/admin/shared/number_with_currency",
                        f: f,
                        amount_attr: :price,

data/app/views/spree/admin/users/_user_page_actions.html.erb

@@ -1,5 +1,5 @@
 <% content_for :page_actions do %>
-  <% if can?([:admin, :create], Spree::Order) %>
+  <% if can?(:admin, Spree::Order) && can?(:create, Spree::Order) %>
     <li>
       <%= link_to t(".create_order"), spree.new_admin_order_path(user_id: @user.id), class: 'btn btn-primary' %>
     </li>

data/app/views/spree/admin/users/items.html.erb

@@ -60,7 +60,7 @@
                 </span>
               </td>
               <td class="order-number">
-                <% if can?([:admin, :edit], order) %>
+                <% if can?(:admin, order) && can?(:edit, order) %>
                   <%= link_to order.number, edit_admin_order_url(order) %>
                 <% else %>
                   <%= order.number %>

data/app/views/spree/admin/users/orders.html.erb

@@ -38,7 +38,7 @@
         <tr data-hook="admin_orders_index_rows">
           <td class="order-completed-at"><%= l(order.completed_at.to_date) if order.completed_at %></td>
           <td class="order-number">
-            <% if can?([:admin, :edit], order) %>
+            <% if can?(:admin, order) && can?(:edit, order) %>
               <%= link_to order.number, edit_admin_order_path(order) %>
             <% else %>
               <%= order.number %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_backend
 version: !ruby/object:Gem::Version
-  version: 3.2.3
+  version: 3.2.5
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-03 00:00:00.000000000 Z
+date: 2022-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: 3.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: 3.2.5
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: 3.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: 3.2.5
 - !ruby/object:Gem::Dependency
   name: font-awesome-rails
   requirement: !ruby/object:Gem::Requirement
@@ -911,7 +911,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.3.19
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Admin interface for the Solidus e-commerce framework.