From d92eaf729bd74983b19f7e17fed22a29650068fa Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Mon, 19 Mar 2018 09:52:37 +0100
Subject: [PATCH] [FEAT] #221 Hide basket pages
---
...asket-administration-settings-modal.component.html | 7 -------
.../administration/basket-administration.component.ts | 11 +++++++----
2 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/apps/maarch_entreprise/Views/basket-administration-settings-modal.component.html b/apps/maarch_entreprise/Views/basket-administration-settings-modal.component.html
index 4a8f01c4e7e..989755a12ce 100644
--- a/apps/maarch_entreprise/Views/basket-administration-settings-modal.component.html
+++ b/apps/maarch_entreprise/Views/basket-administration-settings-modal.component.html
@@ -13,13 +13,6 @@
[(ngModel)]="data.action.used_in_basketlist">{{lang.usedInBasketlist}}</mat-checkbox>
</div>
</div>
- <mat-form-field style="margin-top:5px;">
- <mat-select id="actionPages" name="actionPages" placeholder="{{lang.resultPages}}" [(ngModel)]="data.group.result_page">
- <mat-option *ngFor="let page of data.pages" [value]="page.id">
- {{page.label}}
- </mat-option>
- </mat-select>
- </mat-form-field>
<mat-tab-group>
<mat-tab *ngIf="data.action.keyword == 'redirect'||data.action.keyword == 'indexing'">
<ng-template mat-tab-label *ngIf="data.action.keyword == 'redirect'">
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 3c72a2549fc..8cb6bbe3838 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
@@ -265,12 +265,15 @@ export class BasketAdministrationComponent implements OnInit {
styles: [".mat-dialog-content{height: 65vh;}"]
})
export class BasketAdministrationSettingsModalComponent extends AutoCompletePlugin {
- lang: any = LANG;
- allEntities: any[] = [];
- statuses: any;
+
+ lang : any = LANG;
+ allEntities : any[] = [];
+ statuses : any;
+
constructor(public http: HttpClient, @Inject(MAT_DIALOG_DATA) public data: any, public dialogRef: MatDialogRef<BasketAdministrationSettingsModalComponent>) {
super(http, ['users']);
}
+
ngOnInit(): void {
this.http.get(this.coreUrl + "rest/entities")
.subscribe((entities: any) => {
@@ -333,7 +336,7 @@ export class BasketAdministrationSettingsModalComponent extends AutoCompletePlug
});
}, () => {
location.href = "index.php";
- })
+ });
this.http.get(this.coreUrl + 'rest/statuses')
.subscribe((data: any) => {
this.statuses = data.statuses;
--
GitLab