raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-29 21:17:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10391 from jibees/10390-current-master-not-in-prod-missing-pagination-from-orders-page

Browse Source 
Orders page and BOM page: use the same pagination file
This commit is contained in:
Maikel
2023-02-08 11:15:31 +11:00
committed by GitHub
parent 0f203a474c 80ba228910
commit 0ca7319e32
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/admin/shared/_angular_per_page_controls.html.haml
View File

@@ -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} }}

2
app/views/spree/admin/orders/bulk_management.html.haml
View File

@@ -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' }

2
app/views/spree/admin/orders/index.html.haml
View File

@@ -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