From 8fca9570c20a0a51e5fbafa936655b32566cfe32 Mon Sep 17 00:00:00 2001
From: Alex Orluc <alex.orluc@maarch.org>
Date: Mon, 30 Apr 2018 11:03:49 +0200
Subject: [PATCH] FIX #7636 fix set default action
---
.../administration/basket-administration.component.ts | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/apps/maarch_entreprise/js/angular/app/administration/basket-administration.component.ts b/apps/maarch_entreprise/js/angular/app/administration/basket-administration.component.ts
index dd2c99d2ef7..4d7e4e007f0 100644
--- a/apps/maarch_entreprise/js/angular/app/administration/basket-administration.component.ts
+++ b/apps/maarch_entreprise/js/angular/app/administration/basket-administration.component.ts
@@ -178,8 +178,13 @@ export class BasketAdministrationComponent implements OnInit {
setDefaultAction(group: any, action: any) {
group.groupActions.forEach((tmpAction: any) => {
- tmpAction.default_action_list = (action.id == tmpAction.id);
- tmpAction.used_in_action_page = (action.id == tmpAction.id);
+ if (tmpAction.id == action.id) {
+ tmpAction.default_action_list = true;
+ tmpAction.used_in_action_page = true;
+ tmpAction.used_in_basketlist = true;
+ } else {
+ tmpAction.default_action_list = false;
+ }
});
this.addAction(group);
}
@@ -193,6 +198,7 @@ export class BasketAdministrationComponent implements OnInit {
});
}
+
unlinkGroup(groupIndex: any) {
let r = confirm(this.lang.unlinkGroup + ' ?');
@@ -519,6 +525,7 @@ export class BasketAdministrationGroupListModalComponent {
this.newBasketGroup.result_page = 'list_with_attachments';
this.actionAll[0].used_in_action_page = true;
this.actionAll[0].default_action_list = true;
+ this.actionAll[0].used_in_basketlist = true;
this.actionAll[0].checked = true;
this.newBasketGroup.groupActions = this.actionAll;
} else {
--
GitLab