diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f9bb20d5a1..287496f384f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1897,7 +1897,6 @@ should respond to `call`. - Add a reference to the Writing Extensions doc [#2851](https://github.com/solidusio/solidus/pull/2851) ([jacobherrington](https://github.com/jacobherrington)) - Add article that documents a Spree::Order journey [#2803](https://github.com/solidusio/solidus/pull/2803) ([benjaminwil](https://github.com/benjaminwil)) - ## Solidus 2.7.0 (2018-09-14) ### Major Changes @@ -2131,7 +2130,6 @@ In this version we are beginning to deprecate this using the [`discard`](https:/ [solidus_stock_transfers](https://github.com/solidusio-contrib/solidus_stock_transfers) provides an admin interface to transfer stock between two locations. This used to be included in core but has been extracted to a gem. - Extract stock transfers to the [solidus_stock_transfers](https://github.com/solidusio-contrib/solidus_stock_transfers) gem. [#2379](https://github.com/solidusio/solidus/pull/2379) ([jhawthorn](https://github.com/jhawthorn)) - ## Misc - Generate correct number of codes in BatchBuilder [#2578](https://github.com/solidusio/solidus/pull/2578) ([jhawthorn](https://github.com/jhawthorn)) @@ -2349,7 +2347,6 @@ In this version we are beginning to deprecate this using the [`discard`](https:/ either update their customizations or include the [solidus_legacy_stock_system](https://github.com/solidusio-contrib/solidus_legacy_stock_system) extension, which provides the old classes. - ### Core - Replace Stock::Coordinator with Stock::SimpleCoordinator [#2199](https://github.com/solidusio/solidus/pull/2199) ([jhawthorn](https://github.com/jhawthorn)) @@ -2472,8 +2469,6 @@ In this version we are beginning to deprecate this using the [`discard`](https:/ - Deprecate support for alternate Kaminari page_method_name [#2115](https://github.com/solidusio/solidus/pull/2115) ([cbrunsdon](https://github.com/cbrunsdon)) - Deprecate update_params_payment_source method [#2227](https://github.com/solidusio/solidus/pull/2227) ([ccarruitero](https://github.com/ccarruitero)) - - ## Solidus 2.3.0 (2017-07-31) - Rails 5.1 [\#1895](https://github.com/solidusio/solidus/pull/1895) ([jhawthorn](https://github.com/jhawthorn)) @@ -2538,7 +2533,6 @@ In this version we are beginning to deprecate this using the [`discard`](https:/ - Fix typo on the new promotions form [\#2035](https://github.com/solidusio/solidus/pull/2035) ([swcraig](https://github.com/swcraig)) - Use translated model name in admin payment methods form [\#1975](https://github/com/solidusio/solidus/pull/1975) ([tvdeyen](https://github.com/tvdeyen)) - ### Deprecations - Renamed `Spree::Gateway` payment method into `Spree::PaymentMethod::CreditCard` [\#2001](https://github.com/solidusio/solidus/pull/2001) ([tvdeyen](https://github.com/tvdeyen)) - Deprecate `#simple_current_order` [\#1915](https://github.com/solidusio/solidus/pull/1915) ([ericsaupe](https://github.com/ericsaupe)) @@ -2552,7 +2546,6 @@ In this version we are beginning to deprecate this using the [`discard`](https:/ - Remove ! from assign\_default\_user\_addresses!, deprecating the old method [\#2019](https://github.com/solidusio/solidus/pull/2019) ([jhawthorn](https://github.com/jhawthorn)) - Emit Spree.url JS deprecation warning in all environments [\#2017](https://github.com/solidusio/solidus/pull/2017) ([jhawthorn](https://github.com/jhawthorn)) - ## Solidus 2.2.1 (2017-05-09) - Fix migrating CreditCards to WalletPaymentSource [\#1898](https://github.com/solidusio/solidus/pull/1898) ([jhawthorn](https://github.com/jhawthorn)) @@ -2581,7 +2574,6 @@ In this version we are beginning to deprecate this using the [`discard`](https:/ See the "Admin UI" section below for a full list of changes. - ### Core - `Spree::Order#available_payment_methods` returns an `ActiveRecord::Relation` instead of an array [\#1802](https://github.com/solidusio/solidus/pull/1802) ([luukveenis](https://github.com/luukveenis)) - Product slugs no longer have a minimum length requirement [#1616](https://github.com/solidusio/solidus/pull/1616) ([fschwahn](https://github.com/fschwahn)) @@ -2664,7 +2656,6 @@ In this version we are beginning to deprecate this using the [`discard`](https:/ - Remove `webkit-tap-highlight-color` [\#1792](https://github.com/solidusio/solidus/pull/1792) ([brchristian](https://github.com/brchristian)) - Promotion and Shipping calculators can be created or changed without reloading the page. [#1618](https://github.com/solidusio/solidus/pull/1618) ([jhawthorn](https://github.com/jhawthorn)) - ### Removals - Extract expedited exchanges to an extension [\#1691](https://github.com/solidusio/solidus/pull/1691) ([jhawthorn](https://github.com/jhawthorn)) @@ -2674,7 +2665,6 @@ In this version we are beginning to deprecate this using the [`discard`](https:/ - Remove unused payment Javascript [\#1735](https://github.com/solidusio/solidus/pull/1735) ([jhawthorn](https://github.com/jhawthorn)) - Moved `spree/admin/shared/_translations` partial to `spree/admin/shared/_js_locale_data`. - ### Deprecations - Deprecate `Order#has_step?` in favour of `has_checkout_step?` [#1667](https://github.com/solidusio/solidus/pull/1667) ([mamhoff](https://github.com/mamhoff)) @@ -2687,7 +2677,6 @@ In this version we are beginning to deprecate this using the [`discard`](https:/ - Deprecate `fill_in_quantity` capybara helper [#1710](https://github.com/solidusio/solidus/pull/1710) ([jhawthorn](https://github.com/jhawthorn)) - Deprecate `wait_for_ajax` capybara helper [#1668](https://github.com/solidusio/solidus/pull/1668) ([cbrunsdon](https://github.com/cbrunsdon)) - ## Solidus 2.1.0 (2017-01-17) * The OrderUpdater (as used by `order.update!`) now fully updates taxes. diff --git a/Gemfile b/Gemfile index cf6f20e6c83..6397c57d3c9 100644 --- a/Gemfile +++ b/Gemfile @@ -45,7 +45,6 @@ group :backend do gem 'net-http', require: false end - if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3') # Need to explicitly declare gems when using ruby 3.0 with older versions of rails. Can be removed when mail 2.8.0 is released. # - https://bugs.ruby-lang.org/issues/17873 diff --git a/README.md b/README.md index 31d74470f4e..b45527a99ac 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,6 @@ - **Join our Slack**: [http://slack.solidus.io/](http://slack.solidus.io/) - **Solidus Security**: [mailing list](https://groups.google.com/forum/#!forum/solidus-security) - ## Table of Contents - [Supporting Solidus](#supporting-solidus) - [Summary](#summary) diff --git a/api/LICENSE b/api/LICENSE index 3946ad638a7..bef97d82cc6 100644 --- a/api/LICENSE +++ b/api/LICENSE @@ -24,4 +24,3 @@ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - diff --git a/api/openapi/errors.md b/api/openapi/errors.md index 5712b6eef9d..4e37e19b3bd 100644 --- a/api/openapi/errors.md +++ b/api/openapi/errors.md @@ -1,3 +1,3 @@ # Errors -Error responses for each endpoint are documented. When interacting with an endpoint, make sure to handle all possible errors appropriately. \ No newline at end of file +Error responses for each endpoint are documented. When interacting with an endpoint, make sure to handle all possible errors appropriately. diff --git a/api/openapi/main.hub.yml b/api/openapi/main.hub.yml index 975236b90a2..33053451ed7 100644 --- a/api/openapi/main.hub.yml +++ b/api/openapi/main.hub.yml @@ -13,18 +13,15 @@ pages: data: >- # Solidus API - Welcome! This is the documentation for the [Solidus](https://solidus.io) REST API. - This documentation refers to a stock installation of Solidus. However, every store may customize their API in any number of ways, so make sure to ensure the store you are working with conforms to this documentation or refer to the store's own documentation for interacting with the API. - Endpoints are grouped by the logical resource they interact with. Note that some of the endpoints are duplicated, since the same resource may be accessed at the root level or as the child of diff --git a/backend/app/assets/javascripts/spree/backend/admin.js b/backend/app/assets/javascripts/spree/backend/admin.js index 96c6ba53714..2a87298f5a2 100644 --- a/backend/app/assets/javascripts/spree/backend/admin.js +++ b/backend/app/assets/javascripts/spree/backend/admin.js @@ -37,7 +37,6 @@ Spree.ready(function() { }); }); - $.fn.visible = function(cond) { this[cond ? 'show' : 'hide' ]() }; // Apply to individual radio button that makes another element visible when checked diff --git a/backend/app/assets/javascripts/spree/backend/images/upload.js b/backend/app/assets/javascripts/spree/backend/images/upload.js index 7808d517f6e..424434f70d8 100644 --- a/backend/app/assets/javascripts/spree/backend/images/upload.js +++ b/backend/app/assets/javascripts/spree/backend/images/upload.js @@ -21,7 +21,6 @@ Spree.prepareImageUploader = function () { }); }; - Spree.ready(function () { Spree.prepareImageUploader(); }); diff --git a/backend/app/assets/javascripts/spree/backend/models/image_upload.js b/backend/app/assets/javascripts/spree/backend/models/image_upload.js index 92a117de5f5..e2d155a0ff2 100644 --- a/backend/app/assets/javascripts/spree/backend/models/image_upload.js +++ b/backend/app/assets/javascripts/spree/backend/models/image_upload.js @@ -24,7 +24,6 @@ Spree.Models.ImageUpload = Backbone.Model.extend({ 'image/gif': true }, - previewFile: function () { var file = this.get('file'), that = this; diff --git a/backend/app/assets/stylesheets/spree/backend/globals/_variables_override.scss b/backend/app/assets/stylesheets/spree/backend/globals/_variables_override.scss index afc5b57f7af..0a49b49d2f5 100644 --- a/backend/app/assets/stylesheets/spree/backend/globals/_variables_override.scss +++ b/backend/app/assets/stylesheets/spree/backend/globals/_variables_override.scss @@ -5,4 +5,3 @@ file in your application and set variables according to globals/_variables.scss file. --------------------------------------------------------- */ - diff --git a/backend/app/assets/stylesheets/spree/backend/sections/_image_settings.scss b/backend/app/assets/stylesheets/spree/backend/sections/_image_settings.scss index 2be0f8ff46a..dc7a29b1b28 100644 --- a/backend/app/assets/stylesheets/spree/backend/sections/_image_settings.scss +++ b/backend/app/assets/stylesheets/spree/backend/sections/_image_settings.scss @@ -1,3 +1,3 @@ .destroy_style, .destroy_header { float: right; -} \ No newline at end of file +} diff --git a/backend/app/assets/stylesheets/spree/backend/shared/_typography.scss b/backend/app/assets/stylesheets/spree/backend/shared/_typography.scss index 8f2d194c54a..1a3a7c80fc2 100644 --- a/backend/app/assets/stylesheets/spree/backend/shared/_typography.scss +++ b/backend/app/assets/stylesheets/spree/backend/shared/_typography.scss @@ -32,7 +32,6 @@ h4 { line-height: $h1-font-size } h5 { line-height: $h1-font-size } h6 { line-height: $h1-font-size } - // Lists //-------------------------------------------------------------- ul { diff --git a/backend/app/views/spree/admin/adjustments/new.html.erb b/backend/app/views/spree/admin/adjustments/new.html.erb index 8823a9f6499..1c9bf3131fb 100644 --- a/backend/app/views/spree/admin/adjustments/new.html.erb +++ b/backend/app/views/spree/admin/adjustments/new.html.erb @@ -3,7 +3,6 @@ <% admin_breadcrumb(link_to plural_resource_name(Spree::Adjustment), spree.admin_order_adjustments_path(@order)) %> <% admin_breadcrumb(t('spree.new_adjustment')) %> - <% content_for :page_actions do %> <% end %> diff --git a/backend/app/views/spree/admin/customer_returns/new.html.erb b/backend/app/views/spree/admin/customer_returns/new.html.erb index 46d08eebded..8c84c0b5240 100644 --- a/backend/app/views/spree/admin/customer_returns/new.html.erb +++ b/backend/app/views/spree/admin/customer_returns/new.html.erb @@ -3,7 +3,6 @@ <% admin_breadcrumb(link_to plural_resource_name(Spree::CustomerReturn), spree.admin_order_customer_returns_url(@order)) %> <% admin_breadcrumb(t('spree.new_customer_return')) %> - <% content_for :page_actions do %> <% end %> diff --git a/backend/app/views/spree/admin/images/edit.html.erb b/backend/app/views/spree/admin/images/edit.html.erb index 9cefc632e3a..bd9e48811b3 100644 --- a/backend/app/views/spree/admin/images/edit.html.erb +++ b/backend/app/views/spree/admin/images/edit.html.erb @@ -5,7 +5,6 @@ <% admin_breadcrumb(link_to plural_resource_name(Spree::Image), admin_product_images_path(@product)) %> <% admin_breadcrumb(@image.filename) %> - <% content_for :page_actions do %>
  • <%= link_to t('spree.back_to_images_list'), admin_product_images_url(@product), class: 'btn btn-primary' %>
    • <% end %> diff --git a/backend/app/views/spree/admin/images/index.html.erb b/backend/app/views/spree/admin/images/index.html.erb index cbde4e00d2b..f20e49a5996 100644 --- a/backend/app/views/spree/admin/images/index.html.erb +++ b/backend/app/views/spree/admin/images/index.html.erb @@ -2,7 +2,6 @@ <% admin_breadcrumb(plural_resource_name(Spree::Image)) %> - <% content_for :page_actions do %> <% if can?(:create, Spree::Image) %>
  • diff --git a/backend/app/views/spree/admin/option_types/edit.html.erb b/backend/app/views/spree/admin/option_types/edit.html.erb index 69001b6c5e1..1431df514df 100644 --- a/backend/app/views/spree/admin/option_types/edit.html.erb +++ b/backend/app/views/spree/admin/option_types/edit.html.erb @@ -2,7 +2,6 @@ <% admin_breadcrumb(link_to plural_resource_name(Spree::OptionType), spree.admin_option_types_path) %> <% admin_breadcrumb(@option_type.name) %> - <% content_for :page_actions do %>
  • diff --git a/backend/app/views/spree/admin/option_types/index.html.erb b/backend/app/views/spree/admin/option_types/index.html.erb index d89cf3bc8fc..0ae7ab47ae6 100644 --- a/backend/app/views/spree/admin/option_types/index.html.erb +++ b/backend/app/views/spree/admin/option_types/index.html.erb @@ -1,7 +1,6 @@ <% admin_breadcrumb(link_to plural_resource_name(Spree::Product), spree.admin_products_path) %> <% admin_breadcrumb(plural_resource_name(Spree::OptionType)) %> - <% content_for :page_actions do %> <% if can?(:create, Spree::OptionType) %>
  • <%= link_to t('spree.back_to_orders_list'), admin_orders_path, class: 'btn btn-primary' %>
    • <% end %> -
    <%= content_tag :h4, t('spree.account') %> diff --git a/backend/app/views/spree/admin/orders/index.html.erb b/backend/app/views/spree/admin/orders/index.html.erb index d6c060b6ae4..e011294148a 100644 --- a/backend/app/views/spree/admin/orders/index.html.erb +++ b/backend/app/views/spree/admin/orders/index.html.erb @@ -2,7 +2,6 @@ <% admin_breadcrumb(plural_resource_name(Spree::Order)) %> - <% content_for :page_actions do %>
  • <%= link_to t('spree.new_order'), new_admin_order_url, id: 'admin_new_order', class: 'btn btn-primary' %> diff --git a/backend/app/views/spree/admin/payment_methods/index.html.erb b/backend/app/views/spree/admin/payment_methods/index.html.erb index be6a657591f..ac5b1758139 100644 --- a/backend/app/views/spree/admin/payment_methods/index.html.erb +++ b/backend/app/views/spree/admin/payment_methods/index.html.erb @@ -4,7 +4,6 @@ <% admin_breadcrumb(plural_resource_name(Spree::Payment)) %> <% admin_breadcrumb(plural_resource_name(Spree::PaymentMethod)) %> - <% content_for :page_actions do %> <% if can?(:create, Spree::PaymentMethod) %>
  • diff --git a/backend/app/views/spree/admin/payment_methods/new.html.erb b/backend/app/views/spree/admin/payment_methods/new.html.erb index ff3da9f77b8..62df088d880 100644 --- a/backend/app/views/spree/admin/payment_methods/new.html.erb +++ b/backend/app/views/spree/admin/payment_methods/new.html.erb @@ -5,7 +5,6 @@ <% admin_breadcrumb(link_to plural_resource_name(Spree::PaymentMethod), spree.admin_payment_methods_path) %> <% admin_breadcrumb(t('spree.new_payment_method')) %> - <% content_for :page_actions do %> <% end %> diff --git a/backend/app/views/spree/admin/payments/credit.html.erb b/backend/app/views/spree/admin/payments/credit.html.erb index 43d27437f63..e4189ac92d4 100644 --- a/backend/app/views/spree/admin/payments/credit.html.erb +++ b/backend/app/views/spree/admin/payments/credit.html.erb @@ -3,7 +3,6 @@ <% admin_breadcrumb(link_to plural_resource_name(Spree::Payment), spree.admin_order_payments_path(@order)) %> <% admin_breadcrumb(Spree::Refund.model_name.human) %> - <%= form_tag do %>

    <%= Spree::Refund.model_name.human %>

    diff --git a/backend/app/views/spree/admin/payments/new.html.erb b/backend/app/views/spree/admin/payments/new.html.erb index 73240680744..6b4bd01f22c 100644 --- a/backend/app/views/spree/admin/payments/new.html.erb +++ b/backend/app/views/spree/admin/payments/new.html.erb @@ -3,7 +3,6 @@ <% admin_breadcrumb(link_to plural_resource_name(Spree::Payment), spree.admin_order_payments_path(@order)) %> <% admin_breadcrumb(t('spree.new_payment')) %> - <% content_for :page_actions do %> <% end %> diff --git a/backend/app/views/spree/admin/promotion_actions/create.js.erb b/backend/app/views/spree/admin/promotion_actions/create.js.erb index 6e855ab0a29..7c137c94b71 100644 --- a/backend/app/views/spree/admin/promotion_actions/create.js.erb +++ b/backend/app/views/spree/admin/promotion_actions/create.js.erb @@ -4,7 +4,6 @@ $(".variant_autocomplete").variantAutocomplete(); initPromotionActions(); - $('#<%= dom_id @promotion_action %>').hide(); $('#<%= dom_id @promotion_action %>').fadeIn(); new Spree.CalculatorEditView({el: $('#<%= dom_id @promotion_action %> .js-calculator-fields')}); diff --git a/backend/app/views/spree/admin/promotion_actions/destroy.js.erb b/backend/app/views/spree/admin/promotion_actions/destroy.js.erb index 6b40385a82b..a6120db69ea 100644 --- a/backend/app/views/spree/admin/promotion_actions/destroy.js.erb +++ b/backend/app/views/spree/admin/promotion_actions/destroy.js.erb @@ -1 +1 @@ -$('#<%= dom_id @promotion_action %>').fadeOut().remove(); \ No newline at end of file +$('#<%= dom_id @promotion_action %>').fadeOut().remove(); diff --git a/backend/app/views/spree/admin/promotion_categories/edit.html.erb b/backend/app/views/spree/admin/promotion_categories/edit.html.erb index 17e2840ea94..49627e3751e 100644 --- a/backend/app/views/spree/admin/promotion_categories/edit.html.erb +++ b/backend/app/views/spree/admin/promotion_categories/edit.html.erb @@ -2,7 +2,6 @@ <% admin_breadcrumb(link_to plural_resource_name(Spree::PromotionCategory), spree.admin_promotion_categories_path) %> <% admin_breadcrumb(@promotion_category.name) %> - <%= form_for @promotion_category, url: object_url, method: :put do |f| %>
    <%= render partial: 'form', locals: { f: f } %> diff --git a/backend/app/views/spree/admin/promotion_categories/index.html.erb b/backend/app/views/spree/admin/promotion_categories/index.html.erb index 97d6c3dea2c..ed12a80b31f 100644 --- a/backend/app/views/spree/admin/promotion_categories/index.html.erb +++ b/backend/app/views/spree/admin/promotion_categories/index.html.erb @@ -1,7 +1,6 @@ <% admin_breadcrumb(link_to plural_resource_name(Spree::Promotion), spree.admin_promotions_path) %> <% admin_breadcrumb(plural_resource_name(Spree::PromotionCategory)) %> - <% content_for :page_actions do %> <% if can?(:create, Spree::PromotionCategory) %>
  • diff --git a/backend/app/views/spree/admin/promotion_categories/new.html.erb b/backend/app/views/spree/admin/promotion_categories/new.html.erb index b1e25f73e92..ac56c17ee3f 100644 --- a/backend/app/views/spree/admin/promotion_categories/new.html.erb +++ b/backend/app/views/spree/admin/promotion_categories/new.html.erb @@ -2,7 +2,6 @@ <% admin_breadcrumb(link_to plural_resource_name(Spree::PromotionCategory), spree.admin_promotion_categories_path) %> <% admin_breadcrumb(t('spree.new_promotion_category')) %> - <%= form_for :promotion_category, url: collection_url do |f| %>
    <%= render partial: 'form', locals: { f: f } %> diff --git a/backend/app/views/spree/admin/promotion_rules/destroy.js.erb b/backend/app/views/spree/admin/promotion_rules/destroy.js.erb index c5490e5bd47..68d2b3f7e16 100644 --- a/backend/app/views/spree/admin/promotion_rules/destroy.js.erb +++ b/backend/app/views/spree/admin/promotion_rules/destroy.js.erb @@ -1,3 +1,3 @@ $('#<%= dom_id @promotion_rule %>').fadeOut().remove(); -$('#promotion_rule_type').html('<%= escape_javascript options_for_promotion_rule_types(@promotion) %>'); \ No newline at end of file +$('#promotion_rule_type').html('<%= escape_javascript options_for_promotion_rule_types(@promotion) %>'); diff --git a/backend/app/views/spree/admin/promotions/_rules.html.erb b/backend/app/views/spree/admin/promotions/_rules.html.erb index 978b2d7c32d..f2fb03e9cf5 100644 --- a/backend/app/views/spree/admin/promotions/_rules.html.erb +++ b/backend/app/views/spree/admin/promotions/_rules.html.erb @@ -16,7 +16,6 @@
    <% end %> - <%= form_for @promotion, url: object_url, method: :put do |f| %>
    <% if Spree::Config.allow_promotions_any_match_policy %> diff --git a/backend/app/views/spree/admin/promotions/actions/_create_adjustment.html.erb b/backend/app/views/spree/admin/promotions/actions/_create_adjustment.html.erb index 1cbfa649cea..2fb57a79ac7 100644 --- a/backend/app/views/spree/admin/promotions/actions/_create_adjustment.html.erb +++ b/backend/app/views/spree/admin/promotions/actions/_create_adjustment.html.erb @@ -1,2 +1,2 @@ <%= render partial: 'spree/admin/promotions/actions/promotion_calculators_with_custom_fields', - locals: { calculators: @calculators, promotion_action: promotion_action, param_prefix: param_prefix } %> \ No newline at end of file + locals: { calculators: @calculators, promotion_action: promotion_action, param_prefix: param_prefix } %> diff --git a/backend/app/views/spree/admin/promotions/index.html.erb b/backend/app/views/spree/admin/promotions/index.html.erb index e1508d4be77..9465cfcc9b0 100644 --- a/backend/app/views/spree/admin/promotions/index.html.erb +++ b/backend/app/views/spree/admin/promotions/index.html.erb @@ -63,7 +63,6 @@ <% end %> - <%= paginate @promotions, theme: "solidus_admin" %> <% if @promotions.length > 0 %> diff --git a/backend/app/views/spree/admin/properties/edit.html.erb b/backend/app/views/spree/admin/properties/edit.html.erb index 6ccfd51dcf3..7414a69d292 100644 --- a/backend/app/views/spree/admin/properties/edit.html.erb +++ b/backend/app/views/spree/admin/properties/edit.html.erb @@ -2,7 +2,6 @@ <% admin_breadcrumb(link_to plural_resource_name(Spree::Property), spree.admin_properties_path) %> <% admin_breadcrumb(@property.name) %> - <%= render partial: 'spree/shared/error_messages', locals: { target: @property } %> <%= form_for [:admin, @property] do |f| %> diff --git a/backend/app/views/spree/admin/properties/filtered.html.erb b/backend/app/views/spree/admin/properties/filtered.html.erb index fbb31cb5c96..8cff3b15dde 100644 --- a/backend/app/views/spree/admin/properties/filtered.html.erb +++ b/backend/app/views/spree/admin/properties/filtered.html.erb @@ -1 +1 @@ -<%= auto_complete_result @properties, :name %> \ No newline at end of file +<%= auto_complete_result @properties, :name %> diff --git a/backend/app/views/spree/admin/properties/index.html.erb b/backend/app/views/spree/admin/properties/index.html.erb index 133235ff9ba..8338cfb8349 100644 --- a/backend/app/views/spree/admin/properties/index.html.erb +++ b/backend/app/views/spree/admin/properties/index.html.erb @@ -1,7 +1,6 @@ <% admin_breadcrumb(link_to plural_resource_name(Spree::Product), spree.admin_products_path) %> <% admin_breadcrumb(plural_resource_name(Spree::Property)) %> - <% content_for :page_actions do %> <% if can?(:create, Spree::Property) %>