From 80ba228910ed64dd7dc8628d06bc5a92473163ef Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Tue, 7 Feb 2023 18:10:29 +0100 Subject: [PATCH] Partial is used in two different contexts: orders and line_items Distinguish them by adding a local variable model that could either be `orders` or `line_items` --- app/views/admin/shared/_angular_per_page_controls.html.haml | 6 +++--- app/views/spree/admin/orders/bulk_management.html.haml | 2 +- app/views/spree/admin/orders/index.html.haml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/admin/shared/_angular_per_page_controls.html.haml b/app/views/admin/shared/_angular_per_page_controls.html.haml index 999178a78d..1169ce9bb2 100644 --- a/app/views/admin/shared/_angular_per_page_controls.html.haml +++ b/app/views/admin/shared/_angular_per_page_controls.html.haml @@ -1,7 +1,7 @@ - position ||= "" -.per-page{'ng-show' => '!RequestMonitor.loading && line_items.length > 0', class: ("right" if position == "right") } +.per-page{'ng-show' => "!RequestMonitor.loading && #{model}.length > 0", class: ("right" if position == "right") } %input.per-page-select.ofn-select2{type: 'number', data: 'per_page_options', 'min-search' => 999, 'ng-model' => 'per_page', 'ng-change' => 'fetchResults()'} %span.per-page-feedback - {{ 'spree.admin.line_items.index.results_found' | t:{number: pagination.results} }} - {{ 'spree.admin.orders.index.viewing' | t:{start: ((pagination.page -1) * pagination.per_page) +1, end: ((pagination.page -1) * pagination.per_page) + line_items.length} }} + {{ "spree.admin.#{model}.index.results_found" | t:{number: pagination.results} }} + {{ 'spree.admin.#{model}.index.viewing' | t:{start: ((pagination.page -1) * pagination.per_page) +1, end: ((pagination.page -1) * pagination.per_page) + #{model}.length} }} diff --git a/app/views/spree/admin/orders/bulk_management.html.haml b/app/views/spree/admin/orders/bulk_management.html.haml index 433260f22e..099f8e3bf9 100644 --- a/app/views/spree/admin/orders/bulk_management.html.haml +++ b/app/views/spree/admin/orders/bulk_management.html.haml @@ -106,7 +106,7 @@ %columns-dropdown{ action: "#{controller_name}_#{action_name}" } %div{ style: "flex-grow: 1"} %div{ style: "float: right;"} - = render partial: 'admin/shared/angular_per_page_controls', locals: { position: "right" } + = render partial: 'admin/shared/angular_per_page_controls', locals: { position: "right", model: "line_items" } %div.sixteen.columns.alpha#loading{ 'ng-if' => 'RequestMonitor.loading' } diff --git a/app/views/spree/admin/orders/index.html.haml b/app/views/spree/admin/orders/index.html.haml index d744498fd8..8ac259dd7c 100644 --- a/app/views/spree/admin/orders/index.html.haml +++ b/app/views/spree/admin/orders/index.html.haml @@ -40,7 +40,7 @@ %span.name{'ng-controller' => 'bulkCancelCtrl', 'ng-click' => 'cancelSelectedOrders()' } = t('.cancel_orders') - = render partial: 'admin/shared/angular_per_page_controls', locals: { position: "right" } + = render partial: 'admin/shared/angular_per_page_controls', locals: { position: "right", model: "orders" } %table#listing_orders.index.responsive{width: "100%", 'ng-init' => 'initialise()', 'ng-show' => "!RequestMonitor.loading && orders.length > 0" } %colgroup