From bbb3265be97ce58195f66aa5689e2c659305f736 Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@sdg.moe>
Date: Wed, 14 Oct 2020 12:03:53 +0200
Subject: [PATCH 1/2] Update page-resolver.service.ts

---
 src/app/services/page-resolver.service.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/services/page-resolver.service.ts b/src/app/services/page-resolver.service.ts
index 566f055f..343582bc 100644
--- a/src/app/services/page-resolver.service.ts
+++ b/src/app/services/page-resolver.service.ts
@@ -27,9 +27,9 @@ export class PageResolver
 
 			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
-					?.replace(/:([^:]*?)(\/|$|&)/, (x, y, z) => `${route.paramMap.get(y)}${z}`)
+					?.replace(/:([^:]*?)(\/|$|&)/g, (x, y, z) => `${route.paramMap.get(y)}${z}`)
 					.split('&')
 					.map(x => x.split('=') as [string, string]);
 				let uri: string;

From 635d889b7ecde550417660d5c170e1c75e71bde0 Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@sdg.moe>
Date: Wed, 14 Oct 2020 12:04:14 +0200
Subject: [PATCH 2/2] Update item-resolver.service.ts

---
 src/app/services/item-resolver.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/services/item-resolver.service.ts b/src/app/services/item-resolver.service.ts
index 15e04944..5a52ae5f 100644
--- a/src/app/services/item-resolver.service.ts
+++ b/src/app/services/item-resolver.service.ts
@@ -21,7 +21,7 @@ export class ItemResolver
 
 			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}`)
 					.pipe(