Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Use doctype setting to set auto-extracted file as private #24828

Merged
merged 7 commits into from Mar 15, 2024
Merged

fix: Use doctype setting to set auto-extracted file as private #24828

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7445de9
fix: Use doctype setting to set auto-extracted file as private
marination Feb 9, 2024
ed6613c
test: use meta for fetching settings
ankush Feb 9, 2024
65c8a37
test: Comment + Comm.n file extraction & Attachments default to publi…
marination Feb 9, 2024
1f3e32a
fix: Use regex in failing test
marination Feb 13, 2024
73982c8
Merge branch 'develop' into txt-attachment-privacy
ankush Feb 22, 2024
c2638d9
Merge branch 'develop' into txt-attachment-privacy
ankush Feb 27, 2024
aa51492
Merge branch 'develop' into txt-attachment-privacy
ankush Mar 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 5 additions & 3 deletions frappe/core/doctype/file/test_file.py
View file
Open in desktop
Expand Up @@ -717,16 +717,18 @@ def tearDown(self) -> None:

class TestFileUtils(FrappeTestCase):
def test_extract_images_from_doc(self):
is_private = not frappe.db.get_value("DocType", "ToDo", "make_attachments_public")
ankush marked this conversation as resolved.
Show resolved Hide resolved

# with filename in data URI
todo = frappe.get_doc(
{
"doctype": "ToDo",
"description": 'Test <img src="data:image/png;filename=pix.png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=">',
}
).insert()
self.assertTrue(frappe.db.exists("File", {"attached_to_name": todo.name}))
self.assertIn('<img src="/files/pix.png">', todo.description)
self.assertListEqual(get_attached_images("ToDo", [todo.name])[todo.name], ["/files/pix.png"])
self.assertTrue(frappe.db.exists("File", {"attached_to_name": todo.name, "is_private": is_private}))
self.assertIn('<img src="/private/files/pix.png">', todo.description)
self.assertListEqual(get_attached_images("ToDo", [todo.name])[todo.name], ["/private/files/pix.png"])

# without filename in data URI
todo = frappe.get_doc(
Expand Down
2 changes: 1 addition & 1 deletion frappe/core/doctype/file/utils.py
View file
Open in desktop
Expand Up @@ -216,7 +216,7 @@ def get_file_name(fname: str, optional_suffix: str | None = None) -> str:

def extract_images_from_doc(doc: "Document", fieldname: str):
content = doc.get(fieldname)
content = extract_images_from_html(doc, content)
content = extract_images_from_html(doc, content, is_private=(not doc.meta.make_attachments_public))
if frappe.flags.has_dataurl:
doc.set(fieldname, content)

Expand Down