extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-27 10:23:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

use "email" as default for emailDisplay attribute in et2-url-email (like before)

Browse Source 
add new attribute value "preference" to use the user preference (like et2-email does)
This commit is contained in:
ralf 2024-01-22 17:11:53 +02:00
parent 57f4776615
commit a0c148b42c
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/js/etemplate/Et2Email/utils.ts
View File

@ -138,7 +138,7 @@ export async function formatEmailAddress(address : string, emailDisplayFormat? :
const split = splitEmail(address);
let content = address;
let contact;
if(!split.name && (contact = await checkContact(address)))
if(emailDisplayFormat !== 'email' && !split.name && (contact = await checkContact(address)))
{
split.name = contact.n_fn;
}

13
api/js/etemplate/Et2Url/Et2UrlEmailReadonly.ts
View File

@ -22,22 +22,25 @@ export class Et2UrlEmailReadonly extends Et2UrlReadonly
/**
* What to display for the selected email addresses
*
* - email: "test@example.com" (default)
* - full: "Mr Test User <test@example.com>
* - name: "Mr Test User"
* - domain: "Mr Test User (example.com)"
* - email: "test@example.com"
* - preference: use the users preference, like et2-email does
*
* If name is unknown, we'll use the email instead.
*/
@property({type: String})
emailDisplay : "full" | "email" | "name" | "domain";
emailDisplay : "email" | "full" | "name" | "domain" | "preference";
set value(val : string)
{
this._value = val;
const split = splitEmail(this._value);
super.statustext = split.name ? split.email : "";
formatEmailAddress(val, this.emailDisplay).then((value) => super.value = value);
formatEmailAddress(val, !this.emailDisplay ? "email" :
(this.emailDisplay === 'preference' ? null : this.emailDisplay)).then(
(value) => super.value = value);
}
get value()
@ -52,8 +55,8 @@ export class Et2UrlEmailReadonly extends Et2UrlReadonly
attrs.onclick = () =>
{
let email;
if (IsEmail.EMAIL_PREG.exec(email=this.value) ||
IsEmail.EMAIL_PREG.exec(email = '"' + this.value + '" <' + this.statustext + '>'))
if (IsEmail.EMAIL_PREG.exec(email=this._value) ||
IsEmail.EMAIL_PREG.exec(email = '"' + this._value + '" <' + this.statustext + '>'))
{
Et2UrlEmail.action(email);
}