From 5605f80ec292262eb3564cdab08433bce4f8692a Mon Sep 17 00:00:00 2001 From: iwsh Date: Mon, 12 Jun 2023 16:20:37 +0000 Subject: [PATCH 1/2] Fix image URL handling for S3 compatibility --- frontend/domain/models/example/example.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/frontend/domain/models/example/example.ts b/frontend/domain/models/example/example.ts index f77dc070..23d4a168 100644 --- a/frontend/domain/models/example/example.ts +++ b/frontend/domain/models/example/example.ts @@ -11,8 +11,11 @@ export class ExampleItem { ) {} get url() { - const l = this.fileUrl.indexOf('media/') - return this.fileUrl.slice(l - 1) + const l = this.fileUrl.indexOf('/media/') + if (l < 0) { + return this.fileUrl + } + return this.fileUrl.slice(l) } } From 1162e57f0465d449e5f5872d8f1ef39456a9c353 Mon Sep 17 00:00:00 2001 From: iwsh Date: Mon, 12 Jun 2023 17:02:44 +0000 Subject: [PATCH 2/2] Enable support for S3 compatible storage providers --- backend/config/settings/aws.py | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/config/settings/aws.py b/backend/config/settings/aws.py index e9279e4e..988d238d 100644 --- a/backend/config/settings/aws.py +++ b/backend/config/settings/aws.py @@ -8,6 +8,7 @@ AWS_ACCESS_KEY_ID = env("AWS_ACCESS_KEY_ID") AWS_SECRET_ACCESS_KEY = env("AWS_SECRET_ACCESS_KEY") AWS_S3_REGION_NAME = env("REGION_NAME", "us-west-1") AWS_STORAGE_BUCKET_NAME = env("BUCKET_NAME", "doccano") +AWS_S3_ENDPOINT_URL = env("AWS_S3_ENDPOINT_URL", None) AWS_DEFAULT_ACL = "private" AWS_BUCKET_ACL = "private" AWS_AUTO_CREATE_BUCKET = True