Merge pull request #302 from kapt-labs/incorrect-urls-for-files-in-em…

…ails FIX: incorrect urls for files in emails
barseghyanartur · Dec 15, 2022 · 7f8c23f · 7f8c23f
2 parents e365bf5 + fb8e7be
commit 7f8c23f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/src/fobi/contrib/plugins/form_handlers/mail/base.py b/src/fobi/contrib/plugins/form_handlers/mail/base.py
@@ -156,6 +156,7 @@ def run(
                 value
                 and isinstance(value, string_types)
                 and value.startswith(settings.MEDIA_URL)
+                and not value.startswith("http")
             ):
                 cleaned_data[key] = "{base_url}{value}".format(
                     base_url=base_url, value=value

diff --git a/src/fobi/contrib/plugins/form_handlers/mail/mixins.py b/src/fobi/contrib/plugins/form_handlers/mail/mixins.py
@@ -46,8 +46,10 @@ def get_rendered_data(
         rendered_data = []
         for key, value in cleaned_data.items():
             if value:
-                if isinstance(value, string_types) and value.startswith(
-                    settings.MEDIA_URL
+                if (
+                    isinstance(value, string_types)
+                    and value.startswith(settings.MEDIA_URL)
+                    and not value.startswith("http")
                 ):
                     cleaned_data[key] = "{base_url}{value}".format(
                         base_url=base_url, value=value

diff --git a/src/fobi/contrib/plugins/form_handlers/mail_sender/base.py b/src/fobi/contrib/plugins/form_handlers/mail_sender/base.py
@@ -146,6 +146,7 @@ def run(
                 value
                 and isinstance(value, string_types)
                 and value.startswith(settings.MEDIA_URL)
+                and not value.startswith("http")
             ):
                 cleaned_data[key] = "{base_url}{value}".format(
                     base_url=base_url, value=value

diff --git a/src/fobi/contrib/plugins/form_handlers/mail_sender/mixins.py b/src/fobi/contrib/plugins/form_handlers/mail_sender/mixins.py
@@ -45,8 +45,10 @@ def get_rendered_data(
         rendered_data = []
         for key, value in cleaned_data.items():
             if value:
-                if isinstance(value, string_types) and value.startswith(
-                    settings.MEDIA_URL
+                if (
+                    isinstance(value, string_types)
+                    and value.startswith(settings.MEDIA_URL)
+                    and not value.startswith("http")
                 ):
                     cleaned_data[key] = "{base_url}{value}".format(
                         base_url=base_url, value=value