diff --git a/apps/maarch_entreprise/js/angular/app/profile.component.ts b/apps/maarch_entreprise/js/angular/app/profile.component.ts index d113003b04d6a2ce0fa7beee697e7e06cb2441f9..94778d3a6acdeaf433cb0c1a7ab2469fbc11a585 100755 --- a/apps/maarch_entreprise/js/angular/app/profile.component.ts +++ b/apps/maarch_entreprise/js/angular/app/profile.component.ts @@ -60,7 +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/docserver/controllers/DocserverController.php b/src/app/docserver/controllers/DocserverController.php index 9b8b276e84c76a4954c305766a840404364af489..70797e19de70b58eae162cb976fb7845eafd5028 100644 --- a/src/app/docserver/controllers/DocserverController.php +++ b/src/app/docserver/controllers/DocserverController.php @@ -36,6 +36,7 @@ class DocserverController $types = []; $docservers = DocserverModel::get(); foreach ($docservers as $docserver) { + $docserver['is_readonly'] = ($docserver['is_readonly'] == 'Y'); $docserver['actual_size_number'] = DocserverController::getDocserverSize(['path' => $docserver['path_template']]); if ($docserver['actual_size_number'] > 1000000000) { $docserver['actualSizeFormatted'] = round($docserver['actual_size_number'] / 1000000000, 3) . ' Go'; @@ -48,7 +49,10 @@ class DocserverController $types[] = $docserver['docserver_type_id']; } - return $response->withJson(['docservers' => $sortedDocservers, 'types' => array_values(array_unique($types))]); + $types = array_values(array_unique($types)); + sort($types); + + return $response->withJson(['docservers' => $sortedDocservers, 'types' => $types]); } public function getById(Request $request, Response $response, array $aArgs)