This commit is contained in:
Zoe Roux 2020-10-22 22:50:50 +02:00
commit 665c98ba03
2 changed files with 3 additions and 3 deletions

View File

@ -21,7 +21,7 @@ export class ItemResolver
resolve(route: ActivatedRouteSnapshot): T | Observable<T> | Promise<T> resolve(route: ActivatedRouteSnapshot): T | Observable<T> | Promise<T>
{ {
const res: string = resource.replace(/:(.*?)(\/|$)/, (x, y) => `${route.paramMap.get(y)}/`); const res: string = resource.replace(/:(.*?)(\/|$)/g, (x, y) => `${route.paramMap.get(y)}/`);
return this.http.get<T>(`api/${res}`) return this.http.get<T>(`api/${res}`)
.pipe( .pipe(

View File

@ -27,9 +27,9 @@ export class PageResolver
resolve(route: ActivatedRouteSnapshot): Page<T> | Observable<Page<T>> | Promise<Page<T>> resolve(route: ActivatedRouteSnapshot): Page<T> | Observable<Page<T>> | Promise<Page<T>>
{ {
let res: string = resource.replace(/:([^:]*?)(\/|$|&)/, (x, y, z) => `${route.paramMap.get(y)}${z}`); let res: string = resource.replace(/:([^:]*?)(\/|$|&)/g, (x, y, z) => `${route.paramMap.get(y)}${z}`);
let query: [string, string][] = defaultQuery let query: [string, string][] = defaultQuery
?.replace(/:([^:]*?)(\/|$|&)/, (x, y, z) => `${route.paramMap.get(y)}${z}`) ?.replace(/:([^:]*?)(\/|$|&)/g, (x, y, z) => `${route.paramMap.get(y)}${z}`)
.split('&') .split('&')
.map(x => x.split('=') as [string, string]); .map(x => x.split('=') as [string, string]);
let uri: string; let uri: string;