From abf8f209ca6332afb9b59d9df4255e57b5352459 Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Wed, 29 Jul 2020 10:09:52 +0200
Subject: [PATCH] FEAT #14408 TIME 0:15 remove disabled options when default
action
---
.../basket-administration-settings-modal.component.html | 4 ++--
.../basket/basket-administration.component.ts | 8 +-------
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/src/frontend/app/administration/basket/basket-administration-settings-modal.component.html b/src/frontend/app/administration/basket/basket-administration-settings-modal.component.html
index 28f3aa6e121..cf891bf7221 100755
--- a/src/frontend/app/administration/basket/basket-administration-settings-modal.component.html
+++ b/src/frontend/app/administration/basket/basket-administration-settings-modal.component.html
@@ -6,12 +6,12 @@
<form #settingGroupsBasket="ngForm">
<div class="container-fluid">
<div class="col-md-6">
- <mat-checkbox [disabled]="data.action.default_action_list == true" id="usedInActionPage"
+ <mat-checkbox id="usedInActionPage"
name="usedInActionPage" color="primary" [(ngModel)]="data.action.used_in_action_page">
{{lang.usedInActionPage}}</mat-checkbox>
</div>
<div class="col-md-6">
- <mat-checkbox [disabled]="data.action.default_action_list == true" id="usedInBasketlist"
+ <mat-checkbox id="usedInBasketlist"
name="usedInBasketlist" color="primary" [(ngModel)]="data.action.used_in_basketlist">
{{lang.usedInBasketlist}}</mat-checkbox>
</div>
diff --git a/src/frontend/app/administration/basket/basket-administration.component.ts b/src/frontend/app/administration/basket/basket-administration.component.ts
index a93acf17365..555860f6b98 100755
--- a/src/frontend/app/administration/basket/basket-administration.component.ts
+++ b/src/frontend/app/administration/basket/basket-administration.component.ts
@@ -221,13 +221,7 @@ export class BasketAdministrationComponent implements OnInit {
setDefaultAction(group: any, action: any) {
group.groupActions.forEach((tmpAction: any) => {
- 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;
- }
+ tmpAction.default_action_list = tmpAction.id === action.id ? true : false;
});
this.addAction(group);
}
--
GitLab