extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-28 17:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Et2Image: Check that src from content is valid to avoid overwriting existing src attribute

Browse Source 
Happens in Kanban contact, src="email" but email has a value (an email address)
This commit is contained in:
nathan 2022-08-15 13:25:08 -06:00
parent d5d6d54902
commit 95f10b57f3
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
api/js/etemplate/Et2Image/Et2Image.ts
View File

@ -197,7 +197,8 @@ export class Et2Image extends Et2Widget(SlotMixin(LitElement)) implements et2_ID
{ {
super.transformAttributes(_attrs); super.transformAttributes(_attrs);
// Expand src with additional stuff. Copy & paste from legacy. // Expand src with additional stuff
// This should go away, since we're not checking for $ or @
if(typeof _attrs["src"] != "undefined") if(typeof _attrs["src"] != "undefined")
{ {
let manager = this.getArrayMgr("content"); let manager = this.getArrayMgr("content");
@ -208,9 +209,16 @@ export class Et2Image extends Et2Widget(SlotMixin(LitElement)) implements et2_ID
{ {
if(typeof src == "object") if(typeof src == "object")
{ {
src = egw().link('/index.php', src); this.src = this.egw().link('/index.php', src);
}
else if(this.src && this.egw().image(src))
{
this.src = src;
}
else if(!this.src)
{
this.src = src;
} }
this.src = src;
} }
} }
} }