extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 06:30:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Placeholder dialog: Placeholder groups can now have groups

Browse Source 
References (info_contact)/ customfields to other apps are expanded so all their placeholders are available as well
This commit is contained in:
nathan 2021-10-04 14:45:57 -06:00
parent 4b67e78012
commit 6126bc2ac9
4 changed files with 151 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
api/js/etemplate/et2_widget_placeholder.ts
View File

@ -138,7 +138,13 @@ export class et2_placeholder_select extends et2_inputWidget
let data = { let data = {
content: {app: '', group: '', entry: {}}, content: {app: '', group: '', entry: {}},
sel_options: {app: [], group: []}, sel_options: {app: [], group: []},
modifications: {outer_box: {entry: {}}} modifications: {
outer_box: {
entry: {
application_list: []
}
}
}
}; };
Object.keys(_data).map((key) => Object.keys(_data).map((key) =>
@ -151,7 +157,7 @@ export class et2_placeholder_select extends et2_inputWidget
}); });
data.sel_options.group = this._get_group_options(Object.keys(_data)[0]); data.sel_options.group = this._get_group_options(Object.keys(_data)[0]);
data.content.app = data.sel_options.app[0].value; data.content.app = data.sel_options.app[0].value;
data.content.group = data.sel_options.group[0].value; data.content.group = data.sel_options.group[0]?.value;
data.content.entry = {app: data.content.app}; data.content.entry = {app: data.content.app};
data.modifications.outer_box.entry.application_list = Object.keys(_data); data.modifications.outer_box.entry.application_list = Object.keys(_data);
// Remove non-app placeholders (user & general) // Remove non-app placeholders (user & general)
@ -315,11 +321,37 @@ export class et2_placeholder_select extends et2_inputWidget
let options = []; let options = [];
Object.keys(et2_placeholder_select.placeholders[appname]).map((key) => Object.keys(et2_placeholder_select.placeholders[appname]).map((key) =>
{ {
options.push( // @ts-ignore
if(Object.keys(et2_placeholder_select.placeholders[appname][key]).filter((key) => isNaN(key)).length > 0)
{
// Handle groups of groups
if(typeof et2_placeholder_select.placeholders[appname][key].label !== "undefined")
{ {
options[key] = et2_placeholder_select.placeholders[appname][key];
}
else
{
options[this.egw().lang(key)] = [];
for(let sub of Object.keys(et2_placeholder_select.placeholders[appname][key]))
{
if(!et2_placeholder_select.placeholders[appname][key][sub])
{
continue;
}
options[key].push({
value: key + '-' + sub,
label: this.egw().lang(sub)
});
}
}
}
else
{
options.push({
value: key, value: key,
label: this.egw().lang(key) label: this.egw().lang(key)
}); });
}
}); });
return options; return options;
} }
@ -333,16 +365,13 @@ export class et2_placeholder_select extends et2_inputWidget
*/ */
_get_placeholders(appname : string, group : string) _get_placeholders(appname : string, group : string)
{ {
let options = []; let _group = group.split('-', 2);
Object.keys(et2_placeholder_select.placeholders[appname][group]).map((key) => let ph = et2_placeholder_select.placeholders[appname];
for(let i = 0; typeof ph !== "undefined" && i < _group.length; i++)
{ {
options.push( ph = ph[_group[i]];
{ }
value: key, return ph || [];
label: et2_placeholder_select.placeholders[appname][group][key]
});
});
return options;
} }
/** /**

47
api/src/Contacts/Merge.php
View File

@ -279,12 +279,20 @@ class Merge extends Api\Storage\Merge
$placeholders = [ $placeholders = [
'contact' => [], 'contact' => [],
'details' => [ 'details' => [
$this->prefix($prefix, 'categories', '{') => lang('Category path'), [
$this->prefix($prefix, 'note', '{') => $this->contacts->contact_fields['note'], 'value' => $this->prefix($prefix, 'categories', '{'),
$this->prefix($prefix, 'id', '{') => $this->contacts->contact_fields['id'], 'label' => lang('Category path')
$this->prefix($prefix, 'owner', '{') => $this->contacts->contact_fields['owner'], ],
$this->prefix($prefix, 'private', '{') => $this->contacts->contact_fields['private'], ['value' => $this->prefix($prefix, 'note', '{'),
$this->prefix($prefix, 'cat_id', '{') => $this->contacts->contact_fields['cat_id'], 'label' => $this->contacts->contact_fields['note']],
['value' => $this->prefix($prefix, 'id', '{'),
'label' => $this->contacts->contact_fields['id']],
['value' => $this->prefix($prefix, 'owner', '{'),
'label' => $this->contacts->contact_fields['owner']],
['value' => $this->prefix($prefix, 'private', '{'),
'label' => $this->contacts->contact_fields['private']],
['value' => $this->prefix($prefix, 'cat_id', '{'),
'label' => $this->contacts->contact_fields['cat_id']],
], ],
]; ];
@ -320,22 +328,31 @@ class Merge extends Api\Storage\Merge
$marker = $this->prefix($prefix, $name, '{'); $marker = $this->prefix($prefix, $name, '{');
if(!array_filter($placeholders, function ($a) use ($marker) if(!array_filter($placeholders, function ($a) use ($marker)
{ {
return array_key_exists($marker, $a); count(array_filter($a, function ($b) use ($marker)
{
return $b['value'] == $marker;
})
) > 0;
})) }))
{ {
$placeholders[$group][$marker] = $label; $placeholders[$group][] = [
'value' => $marker,
'label' => $label
];
} }
} }
// Correctly formatted address by country / preference // Correctly formatted address by country / preference
$placeholders['business'][$this->prefix($prefix, 'adr_one_formatted', '{')] = "Formatted business address"; $placeholders['business'][] = [
$placeholders['private'][$this->prefix($prefix, 'adr_two_formatted', '{')] = "Formatted private address"; 'value' => $this->prefix($prefix, 'adr_one_formatted', '{'),
'label' => "Formatted business address"
];
$placeholders['private'][] = [
'value' => $this->prefix($prefix, 'adr_two_formatted', '{'),
'label' => "Formatted private address"
];
$group = 'customfields'; $this->add_customfield_placeholders($placeholders, $prefix);
foreach($this->contacts->customfields as $name => $field)
{
$placeholders[$group][$this->prefix($prefix, '#' . $name, '{')] = $field['label'];
}
return $placeholders; return $placeholders;
} }

72
api/src/Storage/Merge.php
View File

@ -2738,7 +2738,10 @@ abstract class Merge
return array_key_exists($marker, $a); return array_key_exists($marker, $a);
})) }))
{ {
$placeholders[$group][$marker] = $label; $placeholders[$group][] = [
'value' => $marker,
'label' => $label
];
} }
} }
return $placeholders; return $placeholders;
@ -2753,13 +2756,45 @@ abstract class Merge
$replacements = $contacts->get_placeholder_list($this->prefix($prefix, 'user')); $replacements = $contacts->get_placeholder_list($this->prefix($prefix, 'user'));
unset($replacements['details'][$this->prefix($prefix, 'user/account_id', '{')]); unset($replacements['details'][$this->prefix($prefix, 'user/account_id', '{')]);
$replacements['account'] = [ $replacements['account'] = [
$this->prefix($prefix, 'user/account_id', '{') => 'Account ID', [
$this->prefix($prefix, 'user/account_lid', '{') => 'Login ID' 'value' => $this->prefix($prefix, 'user/account_id', '{'),
'label' => 'Account ID'
],
[
'value' => $this->prefix($prefix, 'user/account_lid', '{'),
'label' => 'Login ID'
]
]; ];
return $replacements; return $replacements;
} }
/**
* Get the list of placeholders for an application's customfields
* If the customfield is a link to another application, we expand and add those placeholders as well
*/
protected function add_customfield_placeholders(&$placeholders, $prefix = '')
{
foreach(Customfields::get($this->get_app()) as $name => $field)
{
if(array_key_exists($field['type'], Api\Link::app_list()))
{
$app = self::get_app_class($field['type']);
if($app)
{
$this->add_linked_placeholders($placeholders, $name, $app->get_placeholder_list('#' . $name));
}
}
else
{
$placeholders['customfields'][] = [
'value' => $this->prefix($prefix, '#' . $name, '{'),
'label' => $field['label'] . ($field['type'] == 'select-account' ? '*' : '')
];
}
}
}
/** /**
* Get a list of placeholders provided. * Get a list of placeholders provided.
* *
@ -2771,11 +2806,34 @@ abstract class Merge
$placeholders = [ $placeholders = [
'placeholders' => [] 'placeholders' => []
]; ];
foreach(Customfields::get($this->get_app()) as $name => $field)
{ $this->add_customfield_placeholders($placeholders, $prefix);
$placeholders['customfields'][$this->prefix($prefix, '#' . $name, '{')] = $field['label'] . ($field['type'] == 'select-account' ? '*' : '');
}
return $placeholders; return $placeholders;
} }
/**
* Add placeholders from another application into the given list of placeholders
*
* This is used for linked entries (like info_contact) and custom fields where the type is another application.
* Here we adjust the group name, and add the group to the end of the placeholder list
* @param array $placeholder_list Our placeholder list
* @param string $base_name Name of the entry (eg: Contact, custom field name)
* @param array $add_placeholder_groups Placeholder list from the other app
*/
protected function add_linked_placeholders(&$placeholder_list, $base_name, $add_placeholder_groups) : void
{
if(!$add_placeholder_groups)
{
// Skip empties
return;
}
/*
foreach($add_placeholder_groups as $group => $add_placeholders)
{
$placeholder_list[$base_name . ': ' . lang($group)] = $add_placeholders;
}
*/
$placeholder_list[$base_name] = $add_placeholder_groups;
}
} }

14
infolog/inc/class.infolog_merge.inc.php
View File

@ -284,10 +284,22 @@ class infolog_merge extends Api\Storage\Merge
return array_key_exists($marker, $a); return array_key_exists($marker, $a);
})) }))
{ {
$placeholders[$group][$marker] = $label; $placeholders[$group][] = [
'value' => $marker,
'label' => $label
];
} }
} }
// Add contact placeholders
$insert_index = 1;
$placeholders = array_slice($placeholders, 0, $insert_index, true) +
[lang($tracking->field2label['info_from']) => []] +
array_slice($placeholders, $insert_index, count($placeholders) - $insert_index, true);
$contact_merge = new Api\Contacts\Merge();
$contact = $contact_merge->get_placeholder_list('info_contact');
$this->add_linked_placeholders($placeholders, lang($tracking->field2label['info_from']), $contact);
return $placeholders; return $placeholders;
} }
} }