From ed30029c883dcac00a10c73d2eebedbe52f5da47 Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Thu, 1 Feb 2018 14:52:53 +0100
Subject: [PATCH] FEAT #55 reorder actions n2
---
.../basket/controllers/BasketController.php | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/app/basket/controllers/BasketController.php b/src/app/basket/controllers/BasketController.php
index b521c8d7891..5fe096d903e 100644
--- a/src/app/basket/controllers/BasketController.php
+++ b/src/app/basket/controllers/BasketController.php
@@ -282,10 +282,23 @@ class BasketController
$allActions = ActionModel::get();
$allActionsPrepared = [];
foreach ($allActions as $allAction) {
- if (empty($allActionsPrepared[$allAction['origin']])) {
- $allActionsPrepared[$allAction['origin']] = [];
+ $found = null;
+ foreach ($allActionsPrepared as $key => $allActionPrepared) {
+ if (!empty($allActionPrepared[$allAction['origin']])) {
+ $found = $key;
+ }
+ }
+ if ($found === null) {
+ $allActionsPrepared[] = [
+ 'origin' => $allAction['origin'],
+ $allAction['origin'] => []
+ ];
+ }
+ foreach ($allActionsPrepared as $key => $allActionPrepared) {
+ if ($allActionPrepared['origin'] == $allAction['origin']) {
+ $allActionsPrepared[$key][$allAction['origin']][] = $allAction;
+ }
}
- $allActionsPrepared[$allAction['origin']][] = $allAction;
}
return $response->withJson(['groups' => $groups, 'allGroups' => $allGroups, 'pages' => $basketPages, 'actions' => $allActionsPrepared]);
--
GitLab