From 3b34733266ea68a081b175a946bfab0ac614a9cf Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Wed, 6 Jun 2018 11:07:55 +0200
Subject: [PATCH] FEAT #7847 Refactoring
---
apps/maarch_entreprise/js/angular/app/profile.component.ts | 4 +++-
src/app/user/controllers/UserController.php | 6 ++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/apps/maarch_entreprise/js/angular/app/profile.component.ts b/apps/maarch_entreprise/js/angular/app/profile.component.ts
index db96e682672..d113003b04d 100755
--- a/apps/maarch_entreprise/js/angular/app/profile.component.ts
+++ b/apps/maarch_entreprise/js/angular/app/profile.component.ts
@@ -3,7 +3,7 @@ import { MediaMatcher } from '@angular/cdk/layout';
import { HttpClient } from '@angular/common/http';
import { LANG } from './translate.component';
import { NotificationService } from './notification.service';
-import { MatPaginator, MatTableDataSource, MatSort, MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material';
+import { MatPaginator, MatTableDataSource, MatSort, MatDialog, MatDialogRef } from '@angular/material';
import { AutoCompletePlugin } from '../plugins/autocomplete.plugin';
@@ -23,6 +23,7 @@ export class ProfileComponent extends AutoCompletePlugin implements OnInit {
private _mobileQueryListener : () => void;
mobileQuery : MediaQueryList;
dialogRef : MatDialogRef<any>;
+
coreUrl : string;
lang : any = LANG;
@@ -59,6 +60,7 @@ export class ProfileComponent extends AutoCompletePlugin implements OnInit {
displayedColumns = ['event_date','info'];
dataSource = new MatTableDataSource(this.histories);
+
@ViewChild(MatPaginator) paginator: MatPaginator;
@ViewChild(MatSort) sort: MatSort;
applyFilter(filterValue: string) {
diff --git a/src/app/user/controllers/UserController.php b/src/app/user/controllers/UserController.php
index df8f174f624..135f52907a4 100644
--- a/src/app/user/controllers/UserController.php
+++ b/src/app/user/controllers/UserController.php
@@ -375,8 +375,7 @@ class UserController
}
return $response->withJson([
- 'baskets' => BasketModel::getBasketsByUserId(['userId' => $user['user_id'], 'unneededBasketId' => ['IndexingBasket']]),
- 'redirectedBaskets' => BasketModel::getRedirectedBasketsByUserId(['userId' => $user['user_id']])
+ 'baskets' => BasketModel::getBasketsByUserId(['userId' => $user['user_id'], 'unneededBasketId' => ['IndexingBasket']])
]);
}
@@ -411,8 +410,7 @@ class UserController
]);
return $response->withJson([
- 'baskets' => BasketModel::getBasketsByUserId(['userId' => $user['user_id'], 'unneededBasketId' => ['IndexingBasket']]),
- 'redirectedBaskets' => BasketModel::getRedirectedBasketsByUserId(['userId' => $user['user_id']])
+ 'baskets' => BasketModel::getBasketsByUserId(['userId' => $user['user_id'], 'unneededBasketId' => ['IndexingBasket']])
]);
}
--
GitLab