mirror/TimeTracker
1
0
Fork 0
mirror of https://github.com/DRYTRIX/TimeTracker.git synced 2026-05-18 04:08:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix(admin): ensure Konva decorative image name and imageUrl in PDF serialization

Browse Source 
Match live layer children to JSON by index and explicitly inject
name and imageUrl for decorative-image nodes, since Konva toJSON()
may not include custom attributes.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
Dries Peeters
2026-02-05 19:12:04 +01:00
parent 42a5d746e8
commit 32aeb7368d
2 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/templates/admin/quote_pdf_layout.html
+18 -1
View File
@@ -5631,7 +5631,24 @@ table tr:last-child td {
// Serialize the stage
const stageJson = stage.toJSON();
// CRITICAL FIX: Manually inject imageUrl into serialized JSON for decorative images
// CRITICAL FIX: Explicitly inject name and imageUrl into serialized JSON for decorative images
// by matching live layer children to JSON by index (Konva may not serialize custom attrs)
const layerJson = stageJson.children && stageJson.children[0];
if (layer && layerJson && layerJson.children && layer.children) {
for (let i = 0; i < layer.children.length; i++) {
const layerChild = layer.children[i];
const jsonChild = layerJson.children[i];
if (!jsonChild) continue;
const name = layerChild.getAttr ? layerChild.getAttr('name') : (layerChild.attrs && layerChild.attrs.name);
if (name && (name === 'decorative-image' || (typeof name === 'string' && name.includes('decorative-image')))) {
if (!jsonChild.attrs) jsonChild.attrs = {};
jsonChild.attrs.name = 'decorative-image';
jsonChild.attrs.imageUrl = (layerChild.getAttr ? layerChild.getAttr('imageUrl') : (layerChild.attrs && layerChild.attrs.imageUrl)) || '';
}
}
}
// Manually inject imageUrl into serialized JSON for decorative images (backup pass)
// Konva's toJSON() might not include custom attributes, so we need to add them manually
let decorativeImageIndex = 0;
function ensureImageUrlInJson(node, parentKey = '') {
templates/admin/pdf_layout.html
+18 -1
View File
@@ -6143,7 +6143,24 @@ table tr:last-child td {
// Serialize the stage
const stageJson = stage.toJSON();
// CRITICAL FIX: Manually inject imageUrl into serialized JSON for decorative images
// CRITICAL FIX: Explicitly inject name and imageUrl into serialized JSON for decorative images
// by matching live layer children to JSON by index (Konva may not serialize custom attrs)
const layerJson = stageJson.children && stageJson.children[0];
if (layer && layerJson && layerJson.children && layer.children) {
for (let i = 0; i < layer.children.length; i++) {
const layerChild = layer.children[i];
const jsonChild = layerJson.children[i];
if (!jsonChild) continue;
const name = layerChild.getAttr ? layerChild.getAttr('name') : (layerChild.attrs && layerChild.attrs.name);
if (name && (name === 'decorative-image' || (typeof name === 'string' && name.includes('decorative-image')))) {
if (!jsonChild.attrs) jsonChild.attrs = {};
jsonChild.attrs.name = 'decorative-image';
jsonChild.attrs.imageUrl = (layerChild.getAttr ? layerChild.getAttr('imageUrl') : (layerChild.attrs && layerChild.attrs.imageUrl)) || '';
}
}
}
// Manually inject imageUrl into serialized JSON for decorative images (backup pass)
// Konva's toJSON() might not include custom attributes, so we need to add them manually
let decorativeImageIndex = 0;
function ensureImageUrlInJson(node, parentKey = '') {