From 61d617196f4dba6ab9eeb76e47ab5232aed0dc93 Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Fri, 19 Oct 2018 16:47:51 +0100
Subject: [PATCH] FIX #8566 select entities in basket redirect

---
 .../administration/basket/basket-administration.component.ts    | 2 +-
 src/frontend/lang/lang-fr.ts                                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/frontend/app/administration/basket/basket-administration.component.ts b/src/frontend/app/administration/basket/basket-administration.component.ts
index f0f6f686f5f..86bb2b2043f 100644
--- a/src/frontend/app/administration/basket/basket-administration.component.ts
+++ b/src/frontend/app/administration/basket/basket-administration.component.ts
@@ -529,7 +529,7 @@ export class BasketAdministrationSettingsModalComponent extends AutoCompletePlug
         this.allEntities.forEach((entity: any) => {
             entity.state = { "opened": false, "selected": false };
             this.data.action.redirects.forEach((keyword: any) => {
-                if (entity.id == keyword.keyword && keyword.redirect_mode == 'USERS') {
+                if ((entity.id == keyword.keyword && keyword.redirect_mode == 'USERS') || (entity.id == keyword.entity_id && keyword.redirect_mode == 'USERS')) {
                     entity.state = { "opened": true, "selected": true };
                 }
             });
diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts
index 284f71f0600..f2eaa199d1a 100755
--- a/src/frontend/lang/lang-fr.ts
+++ b/src/frontend/lang/lang-fr.ts
@@ -522,7 +522,7 @@ export const LANG_FR = {
     "uploadSignFileInfo"                : "Cliquer pour ajouter une signature depuis votre poste",
     "used"                              : "Utilisé",
     "usedInActionPage"                  : "Action sur la page d'action",
-    "usedInBasketlist"                  : "Action sur la liste de résultat",
+    "usedInBasketlist"                  : "Action sur la liste de résultats",
     "user"                              : "utilisateur",
     "userAdded"                         : "Utilisateur ajouté",
     "userAuthorized"                    : "Utilisateur autorisé",
-- 
GitLab