From 71466e643f7d9e1e83c32c2ee12a7a347dd10fca Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Fri, 23 Apr 2021 20:42:54 +0200 Subject: [PATCH] Instanciate only one `ProductsCtrl` - instead of 2: therefore, for each shop display, we only request products one time instead of two times. --- app/views/shop/messages/_select_oc.html.haml | 2 +- app/views/shop/products/_form.html.haml | 2 +- app/views/shopping_shared/tabs/_shop.html.haml | 13 +++++++------ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/app/views/shop/messages/_select_oc.html.haml b/app/views/shop/messages/_select_oc.html.haml index 2f44ed827f..6256789d32 100644 --- a/app/views/shop/messages/_select_oc.html.haml +++ b/app/views/shop/messages/_select_oc.html.haml @@ -1,4 +1,4 @@ -.content.footer-pad{ "darker-background" => true, "ng-controller" => "ProductsCtrl", "ng-show" => "order_cycle.order_cycle_id == null" } +.content.footer-pad{ "darker-background" => true, "ng-show" => "order_cycle.order_cycle_id == null" } .row .small-12.columns .select-oc-message diff --git a/app/views/shop/products/_form.html.haml b/app/views/shop/products/_form.html.haml index 3fbdb1c43f..a4000aa6ce 100644 --- a/app/views/shop/products/_form.html.haml +++ b/app/views/shop/products/_form.html.haml @@ -1,5 +1,5 @@ %form{action: main_app.cart_path} - %products{"ng-controller" => "ProductsCtrl", "ng-init" => "refreshStaleData()", "ng-show" => "order_cycle.order_cycle_id != null", "ng-cloak" => true } + %products{"ng-init" => "refreshStaleData()", "ng-show" => "order_cycle.order_cycle_id != null", "ng-cloak" => true } = render partial: "shop/products/searchbar" diff --git a/app/views/shopping_shared/tabs/_shop.html.haml b/app/views/shopping_shared/tabs/_shop.html.haml index 0a8df040f5..f8a2747c94 100644 --- a/app/views/shopping_shared/tabs/_shop.html.haml +++ b/app/views/shopping_shared/tabs/_shop.html.haml @@ -2,10 +2,11 @@ .order-cycle-bar.hide-for-large-up = render partial: "shopping_shared/order_cycles" - - if no_open_order_cycles? - = render partial: "shop/messages/closed_shop" - - else - = render partial: "shop/messages/select_oc" + %div{"ng-controller" => "ProductsCtrl"} + - if no_open_order_cycles? + = render partial: "shop/messages/closed_shop" + - else + = render partial: "shop/messages/select_oc" - -# Rendering the form, even if there are no open OCs, makes display only shops possible - = render partial: "shop/products/form" + -# Rendering the form, even if there are no open OCs, makes display only shops possible + = render partial: "shop/products/form"