Merge branch 'fix/26562/2301' into '2301_releases_2'

[26562] Chevauchement des icônes dans l'historique des courriers

See merge request maarch/MaarchCourrier!1242

src/frontend/app/history/history.component.html

@@ -44,10 +44,13 @@
     </button>
     <div class="table-head-tool">
         <span style="position: relative;">
-            <mat-paginator #paginatorHistoryList [length]="resultsLength" [hidePageSize]="resultsLength === 0"
-            [pageSizeOptions]="[10, 25, 50, 100, 150]" (page)="handlePageEvent($event)">
+            <mat-paginator #paginatorHistoryList
+                [class.pageInput]="router.url.includes('administration/history')"
+                [length]="resultsLength"
+                [hidePageSize]="resultsLength === 0"
+                [pageSizeOptions]="[10, 25, 50, 100, 150]" (page)="handlePageEvent($event)">
             </mat-paginator>
-            <app-set-page
+            <app-set-page *ngIf="router.url.includes('administration/history')"
                 [paginator]="paginator"
                 [currentPage]="currentPage"
                 [pageLength]="pageLength">

src/frontend/app/history/history.component.scss

@@ -81,7 +81,7 @@
     padding-right: 20px;
 }
 
-.table-head-tool {
+.pageInput {
     ::ng-deep .mat-paginator-range-actions {
         margin-left: -60px;
     }

src/frontend/app/history/history.component.ts

@@ -12,6 +12,7 @@ import { UntypedFormControl } from '@angular/forms';
 import { FunctionsService } from '@service/functions.service';
 import { LatinisePipe } from 'ngx-pipes';
 import { PrivilegeService } from '@service/privileges.service';
+import { Router } from '@angular/router';
 
 @Component({
     selector: 'app-history-list',
@@ -75,7 +76,9 @@ export class HistoryComponent implements OnInit {
         public dialog: MatDialog,
         public functions: FunctionsService,
         private latinisePipe: LatinisePipe,
-        public privilegeService: PrivilegeService) { }
+        public router: Router,
+        public privilegeService: PrivilegeService
+    ) { }
 
     ngOnInit(): void {
         if (this.resId !== null) {